aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-09-23 13:07:49 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-09-23 13:07:49 -0400
commita7c367b95a9d8e65e0f0e7da31f700a556794efb (patch)
tree5b1bb202801e29e3237381aa7aad5aa288378d5b /drivers/Makefile
parent15f964bed054821d6d940d3752508c5f96a9ffd3 (diff)
parente1070211f7327a1f197d535aa886f721a241c32f (diff)
Merge git://git.infradead.org/mtd-2.6
* git://git.infradead.org/mtd-2.6: (58 commits) mtd: jedec_probe: add PSD4256G6V id mtd: OneNand support for Nomadik 8815 SoC (on NHK8815 board) mtd: nand: driver for Nomadik 8815 SoC (on NHK8815 board) m25p80: Add Spansion S25FL129P serial flashes jffs2: Use SLAB_HWCACHE_ALIGN for jffs2_raw_{dirent,inode} slabs mtd: sh_flctl: register sh_flctl using platform_driver_probe() mtd: nand: txx9ndfmc: transfer 512 byte at a time if possible mtd: nand: fix tmio_nand ecc correction mtd: nand: add __nand_correct_data helper function mtd: cfi_cmdset_0002: add 0xFF intolerance for M29W128G mtd: inftl: fix fold chain block number mtd: jedec: fix compilation problem with I28F640C3B definition mtd: nand: fix ECC Correction bug for SMC ordering for NDFC driver mtd: ofpart: Check availability of reg property instead of name property driver/Makefile: Initialize "mtd" and "spi" before "net" mtd: omap: adding DMA mode support in nand prefetch/post-write mtd: omap: add support for nand prefetch-read and post-write mtd: add nand support for w90p910 (v2) mtd: maps: add mtd-ram support to physmap_of mtd: pxa3xx_nand: add single-bit error corrections reporting ...
Diffstat (limited to 'drivers/Makefile')
-rw-r--r--drivers/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/Makefile b/drivers/Makefile
index ccfa259fa848..6ee53c7a57a1 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -43,6 +43,8 @@ obj-y += macintosh/
43obj-$(CONFIG_IDE) += ide/ 43obj-$(CONFIG_IDE) += ide/
44obj-$(CONFIG_SCSI) += scsi/ 44obj-$(CONFIG_SCSI) += scsi/
45obj-$(CONFIG_ATA) += ata/ 45obj-$(CONFIG_ATA) += ata/
46obj-$(CONFIG_MTD) += mtd/
47obj-$(CONFIG_SPI) += spi/
46obj-y += net/ 48obj-y += net/
47obj-$(CONFIG_ATM) += atm/ 49obj-$(CONFIG_ATM) += atm/
48obj-$(CONFIG_FUSION) += message/ 50obj-$(CONFIG_FUSION) += message/
@@ -51,8 +53,6 @@ obj-y += ieee1394/
51obj-$(CONFIG_UIO) += uio/ 53obj-$(CONFIG_UIO) += uio/
52obj-y += cdrom/ 54obj-y += cdrom/
53obj-y += auxdisplay/ 55obj-y += auxdisplay/
54obj-$(CONFIG_MTD) += mtd/
55obj-$(CONFIG_SPI) += spi/
56obj-$(CONFIG_PCCARD) += pcmcia/ 56obj-$(CONFIG_PCCARD) += pcmcia/
57obj-$(CONFIG_DIO) += dio/ 57obj-$(CONFIG_DIO) += dio/
58obj-$(CONFIG_SBUS) += sbus/ 58obj-$(CONFIG_SBUS) += sbus/