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

* git://git.infradead.org/mtd-2.6: (154 commits)
  mtd: cfi_cmdset_0002: use AMD standard command-set with Winbond flash chips
  mtd: cfi_cmdset_0002: Fix MODULE_ALIAS and linkage for new 0701 commandset ID
  mtd: mxc_nand: Remove duplicate NAND_CMD_RESET case value
  mtd: update gfp/slab.h includes
  jffs2: Stop triggering block erases from jffs2_write_super()
  jffs2: Rename jffs2_erase_pending_trigger() to jffs2_dirty_trigger()
  jffs2: Use jffs2_garbage_collect_trigger() to trigger pending erases
  jffs2: Require jffs2_garbage_collect_trigger() to be called with lock held
  jffs2: Wake GC thread when there are blocks to be erased
  jffs2: Erase pending blocks in GC pass, avoid invalid -EIO return
  jffs2: Add 'work_done' return value from jffs2_erase_pending_blocks()
  mtd: mtdchar: Do not corrupt backing device of device node inode
  mtd/maps/pcmciamtd: Fix printk format for ssize_t in debug messages
  drivers/mtd: Use kmemdup
  mtd: cfi_cmdset_0002: Fix argument order in bootloc warning
  mtd: nand: add Toshiba TC58NVG0 device ID
  pcmciamtd: add another ID
  pcmciamtd: coding style cleanups
  pcmciamtd: fixing obvious errors
  mtd: chips: add SST39WF160x NOR-flashes
  ...

Trivial conflicts due to dev_node removal in drivers/mtd/maps/pcmciamtd.c

1 files changed, 0 insertions, 19 deletions

diff --git a/arch/arm/mach-ep93xx/include/mach/ts72xx.h b/arch/arm/mach-ep93xx/include/mach/ts72xx.h
index 93107d88ff3..0eabec62cd9 100644
--- a/arch/arm/mach-ep93xx/include/mach/ts72xx.h
+++ b/arch/arm/mach-ep93xx/include/mach/ts72xx.h
@@ -9,9 +9,6 @@
  * febff000     22000000        4K      model number register
  * febfe000     22400000        4K      options register
  * febfd000     22800000        4K      options register #2
- * febfc000     [67]0000000     4K      NAND data register
- * febfb000     [67]0400000     4K      NAND control register
- * febfa000     [67]0800000     4K      NAND busy register
  * febf9000     10800000        4K      TS-5620 RTC index register
  * febf8000     11700000        4K      TS-5620 RTC data register
  */
@@ -41,22 +38,6 @@
 #define TS72XX_OPTIONS2_TS9420_BOOT     0x02
 
 
-#define TS72XX_NAND1_DATA_PHYS_BASE     0x60000000
-#define TS72XX_NAND2_DATA_PHYS_BASE     0x70000000
-#define TS72XX_NAND_DATA_VIRT_BASE      0xfebfc000
-#define TS72XX_NAND_DATA_SIZE           0x00001000
-
-#define TS72XX_NAND1_CONTROL_PHYS_BASE  0x60400000
-#define TS72XX_NAND2_CONTROL_PHYS_BASE  0x70400000
-#define TS72XX_NAND_CONTROL_VIRT_BASE   0xfebfb000
-#define TS72XX_NAND_CONTROL_SIZE        0x00001000
-
-#define TS72XX_NAND1_BUSY_PHYS_BASE     0x60800000
-#define TS72XX_NAND2_BUSY_PHYS_BASE     0x70800000
-#define TS72XX_NAND_BUSY_VIRT_BASE      0xfebfa000
-#define TS72XX_NAND_BUSY_SIZE           0x00001000
-
-
 #define TS72XX_RTC_INDEX_VIRT_BASE      0xfebf9000
 #define TS72XX_RTC_INDEX_PHYS_BASE      0x10800000
 #define TS72XX_RTC_INDEX_SIZE           0x00001000