diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-30 08:39:56 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-30 08:39:56 -0700 |
commit | 1dd465cac8d3ba18a9840d032f6604147269c031 (patch) | |
tree | 78f00fdeae26d018def75e7517aa50e56f4994df /drivers/mtd/nand | |
parent | a2218cac0aacecbecebd3cabc43cc8a4a09cecbb (diff) | |
parent | 217874feed0d3a6543a6b7127782f4a08bffd731 (diff) |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'drivers/mtd/nand')
-rw-r--r-- | drivers/mtd/nand/s3c2410.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c index 891e3a1b911..b47ebcb31e0 100644 --- a/drivers/mtd/nand/s3c2410.c +++ b/drivers/mtd/nand/s3c2410.c @@ -58,7 +58,6 @@ #include <linux/mtd/partitions.h> #include <asm/io.h> -#include <asm/mach-types.h> #include <asm/hardware/clock.h> #include <asm/arch/regs-nand.h> |