diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-04-29 22:38:01 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-04-29 22:38:01 -0400 |
| commit | 49e1900d4cc2e7bcecb681fe60f0990bec2dcce8 (patch) | |
| tree | 253801ebf57e0a23856a2c7be129c2c178f62fdf /drivers/Makefile | |
| parent | 34f6d749c0a328817d5e36274e53121c1db734dc (diff) | |
| parent | b9099ff63c75216d6ca10bce5a1abcd9293c27e6 (diff) | |
Merge branch 'linux-2.6' into for-2.6.22
Diffstat (limited to 'drivers/Makefile')
| -rw-r--r-- | drivers/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/Makefile b/drivers/Makefile index 3a718f51350e..920c975bb6d4 100644 --- a/drivers/Makefile +++ b/drivers/Makefile | |||
| @@ -72,7 +72,6 @@ obj-$(CONFIG_CPU_FREQ) += cpufreq/ | |||
| 72 | obj-$(CONFIG_MMC) += mmc/ | 72 | obj-$(CONFIG_MMC) += mmc/ |
| 73 | obj-$(CONFIG_NEW_LEDS) += leds/ | 73 | obj-$(CONFIG_NEW_LEDS) += leds/ |
| 74 | obj-$(CONFIG_INFINIBAND) += infiniband/ | 74 | obj-$(CONFIG_INFINIBAND) += infiniband/ |
| 75 | obj-$(CONFIG_IPATH_CORE) += infiniband/ | ||
| 76 | obj-$(CONFIG_SGI_SN) += sn/ | 75 | obj-$(CONFIG_SGI_SN) += sn/ |
| 77 | obj-y += firmware/ | 76 | obj-y += firmware/ |
| 78 | obj-$(CONFIG_CRYPTO) += crypto/ | 77 | obj-$(CONFIG_CRYPTO) += crypto/ |