summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-03-28 14:00:33 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-03-28 14:00:33 -0700
commiteedf2c5296a8dfaaf9aec1a938c1d3bd73159a30 (patch)
treea02e5ef1f2ae46c6328a6744e806c9e7dbff7327 /drivers
parent0151f94f2e61c39858e714a5d92244b0e5a7fdf5 (diff)
parentdf52092f3c97788592ef72501a43fb7ac6a3cfe0 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/arjan/linux-2.6-async-for-30
* git://git.kernel.org/pub/scm/linux/kernel/git/arjan/linux-2.6-async-for-30: fastboot: remove duplicate unpack_to_rootfs() ide/net: flip the order of SATA and network init async: remove the temporary (2.6.29) "async is off by default" code Fix up conflicts in init/initramfs.c manually
Diffstat (limited to 'drivers')
-rw-r--r--drivers/Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/Makefile b/drivers/Makefile
index c1bf4173793..2618a6169a1 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -36,13 +36,14 @@ obj-$(CONFIG_FB_INTEL) += video/intelfb/
obj-y += serial/
obj-$(CONFIG_PARPORT) += parport/
-obj-y += base/ block/ misc/ mfd/ net/ media/
+obj-y += base/ block/ misc/ mfd/ media/
obj-$(CONFIG_NUBUS) += nubus/
-obj-$(CONFIG_ATM) += atm/
obj-y += macintosh/
obj-$(CONFIG_IDE) += ide/
obj-$(CONFIG_SCSI) += scsi/
obj-$(CONFIG_ATA) += ata/
+obj-y += net/
+obj-$(CONFIG_ATM) += atm/
obj-$(CONFIG_FUSION) += message/
obj-$(CONFIG_FIREWIRE) += firewire/
obj-y += ieee1394/