diff options
| author |   Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-02-07 08:11:05 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-02-07 08:11:05 -0200 |
| commit | dece696076936434eb49e43eb2d59ca35cb94376 (patch) | |
| tree | 1ac54cdb0d5c0b3b2afe0f7f9f3e1165704cbc82 /drivers | |
| parent | Merge branch 'origin' (diff) | |
| parent | Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 (diff) | |
| download | linux-dev-dece696076936434eb49e43eb2d59ca35cb94376.tar.xz linux-dev-dece696076936434eb49e43eb2d59ca35cb94376.zip | |
Merge branch 'origin'
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/Makefile b/drivers/Makefile index 619dd964c51c..5c69b86db624 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -69,7 +69,7 @@ obj-$(CONFIG_EISA) += eisa/ obj-$(CONFIG_CPU_FREQ) += cpufreq/ obj-$(CONFIG_MMC) += mmc/ obj-$(CONFIG_INFINIBAND) += infiniband/ -obj-$(CONFIG_SGI_IOC4) += sn/ +obj-$(CONFIG_SGI_SN) += sn/ obj-y += firmware/ obj-$(CONFIG_CRYPTO) += crypto/ obj-$(CONFIG_SUPERH) += sh/ |