git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 60f2652 9faa815)
Merge branch 'master' of git://git.infradead.org/users/dedekind/mtd-tests-2.6
authorDavid Woodhouse <David.Woodhouse@intel.com>
Mon, 5 Jan 2009 16:24:55 +0000 (16:24 +0000)
committerDavid Woodhouse <David.Woodhouse@intel.com>
Mon, 5 Jan 2009 16:24:55 +0000 (16:24 +0000)
Conflicts:
drivers/mtd/Makefile

1  2 
drivers/mtd/Kconfig patch | diff1 | diff2 | blob | history
drivers/mtd/Makefile patch | diff1 | diff2 | blob | history

diff --cc drivers/mtd/Kconfig
Simple merge
diff --cc drivers/mtd/Makefile
index 7fb3dfb,40d304d..4521b1e
--- 1/drivers/mtd/Makefile
--- 2/drivers/mtd/Makefile
+++ b/drivers/mtd/Makefile
@@@ -29,6 -29,6 +29,6 @@@ obj-$(CONFIG_MTD_OOPS)                += mtdoops.
  nftl-objs             := nftlcore.o nftlmount.o
  inftl-objs            := inftlcore.o inftlmount.o
  
- obj-y         += chips/ lpddr/ maps/ devices/ nand/ onenand/ 
 -obj-y         += chips/ maps/ devices/ nand/ onenand/ tests/
++obj-y         += chips/ lpddr/ maps/ devices/ nand/ onenand/ tests/
  
  obj-$(CONFIG_MTD_UBI)         += ubi/
Pandora Kernel Repository