Merge tag 'for-linus-3.4' of git://git.infradead.org/mtd-2.6

[mv-sheeva.git] / arch / arm / mach-u300 / include / mach / u300-regs.h

diff --git a/arch/arm/mach-u300/include/mach/u300-regs.h b/arch/arm/mach-u300/include/mach/u300-regs.h
index b9701fb86db62caa18113993147a4327ecd21008..65f87c523892e0826ea65d4928cb14cb10b30349 100644 (file)
--- a/arch/arm/mach-u300/include/mach/u300-regs.h
+++ b/arch/arm/mach-u300/include/mach/u300-regs.h
@@ -18,12 +18,6 @@
  * the defines are used for setting up the I/O memory mapping.
  */
 
-#ifdef __ASSEMBLER__
-#define IOMEM(a) (a)
-#else
-#define IOMEM(a) (void __iomem *) a
-#endif
-
 /* NAND Flash CS0 */
 #define U300_NAND_CS0_PHYS_BASE                0x80000000