diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-30 17:39:56 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-30 17:39:56 +0200 |
| commit | 1dd465cac8d3ba18a9840d032f6604147269c031 (patch) | |
| tree | 78f00fdeae26d018def75e7517aa50e56f4994df /drivers/mtd | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/chrisw/lsm-2.6 (diff) | |
| parent | [ARM] 2940/1: Fix BTB entry flush in arch/arm/mm/cache-v6.S (diff) | |
| download | linux-1dd465cac8d3ba18a9840d032f6604147269c031.tar.xz linux-1dd465cac8d3ba18a9840d032f6604147269c031.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/maps/bast-flash.c | 1 | ||||
| -rw-r--r-- | drivers/mtd/maps/ixp2000.c | 1 | ||||
| -rw-r--r-- | drivers/mtd/maps/ixp4xx.c | 1 | ||||
| -rw-r--r-- | drivers/mtd/maps/omap_nor.c | 1 | ||||
| -rw-r--r-- | drivers/mtd/maps/sa1100-flash.c | 1 | ||||
| -rw-r--r-- | drivers/mtd/nand/s3c2410.c | 1 |
6 files changed, 0 insertions, 6 deletions
diff --git a/drivers/mtd/maps/bast-flash.c b/drivers/mtd/maps/bast-flash.c index 0c45464e3f7b..0ba0ff7d43b9 100644 --- a/drivers/mtd/maps/bast-flash.c +++ b/drivers/mtd/maps/bast-flash.c @@ -39,7 +39,6 @@ #include <linux/mtd/partitions.h> #include <asm/io.h> -#include <asm/mach-types.h> #include <asm/mach/flash.h> #include <asm/arch/map.h> diff --git a/drivers/mtd/maps/ixp2000.c b/drivers/mtd/maps/ixp2000.c index 3e94b616743d..a9f86c7fbd52 100644 --- a/drivers/mtd/maps/ixp2000.c +++ b/drivers/mtd/maps/ixp2000.c @@ -30,7 +30,6 @@ #include <asm/io.h> #include <asm/hardware.h> -#include <asm/mach-types.h> #include <asm/mach/flash.h> #include <linux/reboot.h> diff --git a/drivers/mtd/maps/ixp4xx.c b/drivers/mtd/maps/ixp4xx.c index bbb0e6e569a6..3fcc32884074 100644 --- a/drivers/mtd/maps/ixp4xx.c +++ b/drivers/mtd/maps/ixp4xx.c @@ -26,7 +26,6 @@ #include <linux/ioport.h> #include <linux/device.h> #include <asm/io.h> -#include <asm/mach-types.h> #include <asm/mach/flash.h> #include <linux/reboot.h> diff --git a/drivers/mtd/maps/omap_nor.c b/drivers/mtd/maps/omap_nor.c index 8cc71409a328..b17bca657daf 100644 --- a/drivers/mtd/maps/omap_nor.c +++ b/drivers/mtd/maps/omap_nor.c @@ -42,7 +42,6 @@ #include <asm/io.h> #include <asm/hardware.h> -#include <asm/mach-types.h> #include <asm/mach/flash.h> #include <asm/arch/tc.h> diff --git a/drivers/mtd/maps/sa1100-flash.c b/drivers/mtd/maps/sa1100-flash.c index 52385705da09..8dcaa357b4bb 100644 --- a/drivers/mtd/maps/sa1100-flash.c +++ b/drivers/mtd/maps/sa1100-flash.c @@ -21,7 +21,6 @@ #include <linux/mtd/partitions.h> #include <linux/mtd/concat.h> -#include <asm/mach-types.h> #include <asm/io.h> #include <asm/sizes.h> #include <asm/mach/flash.h> diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c index 891e3a1b9110..b47ebcb31e0f 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> |