Merge git://git.infradead.org/mtd-2.6

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / Makefile

diff --git a/drivers/Makefile b/drivers/Makefile
index ccfa259fa848743d1cd8c8e3d107696044944a63..6ee53c7a57a1c5162265156bced43d6364c73237 100644 (file)
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -43,6 +43,8 @@ obj-y                         += macintosh/
 obj-$(CONFIG_IDE)              += ide/
 obj-$(CONFIG_SCSI)             += scsi/
 obj-$(CONFIG_ATA)              += ata/
+obj-$(CONFIG_MTD)              += mtd/
+obj-$(CONFIG_SPI)              += spi/
 obj-y                          += net/
 obj-$(CONFIG_ATM)              += atm/
 obj-$(CONFIG_FUSION)           += message/
@@ -51,8 +53,6 @@ obj-y                         += ieee1394/
 obj-$(CONFIG_UIO)              += uio/
 obj-y                          += cdrom/
 obj-y                          += auxdisplay/
-obj-$(CONFIG_MTD)              += mtd/
-obj-$(CONFIG_SPI)              += spi/
 obj-$(CONFIG_PCCARD)           += pcmcia/
 obj-$(CONFIG_DIO)              += dio/
 obj-$(CONFIG_SBUS)             += sbus/