diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-11 09:36:25 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-11 09:36:25 -0400 |
| commit | a8931ef380c92d121ae74ecfb03b2d63f72eea6f (patch) | |
| tree | 980fb6b019e11e6cb1ece55b7faff184721a8053 /drivers/mtd/maps/Makefile | |
| parent | 90574d0a4d4b73308ae54a2a57a4f3f1fa98e984 (diff) | |
| parent | e5a5816f7875207cb0a0a7032e39a4686c5e10a4 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/mtd/maps/Makefile')
| -rw-r--r-- | drivers/mtd/maps/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/mtd/maps/Makefile b/drivers/mtd/maps/Makefile index d6cfce490583..f3b0c5951663 100644 --- a/drivers/mtd/maps/Makefile +++ b/drivers/mtd/maps/Makefile | |||
| @@ -57,7 +57,6 @@ obj-$(CONFIG_MTD_WALNUT) += walnut.o | |||
| 57 | obj-$(CONFIG_MTD_H720X) += h720x-flash.o | 57 | obj-$(CONFIG_MTD_H720X) += h720x-flash.o |
| 58 | obj-$(CONFIG_MTD_SBC8240) += sbc8240.o | 58 | obj-$(CONFIG_MTD_SBC8240) += sbc8240.o |
| 59 | obj-$(CONFIG_MTD_NOR_TOTO) += omap-toto-flash.o | 59 | obj-$(CONFIG_MTD_NOR_TOTO) += omap-toto-flash.o |
| 60 | obj-$(CONFIG_MTD_MPC1211) += mpc1211.o | ||
| 61 | obj-$(CONFIG_MTD_IXP4XX) += ixp4xx.o | 60 | obj-$(CONFIG_MTD_IXP4XX) += ixp4xx.o |
| 62 | obj-$(CONFIG_MTD_IXP2000) += ixp2000.o | 61 | obj-$(CONFIG_MTD_IXP2000) += ixp2000.o |
| 63 | obj-$(CONFIG_MTD_WRSBC8260) += wr_sbc82xx_flash.o | 62 | obj-$(CONFIG_MTD_WRSBC8260) += wr_sbc82xx_flash.o |