diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-08-12 06:28:00 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-08-12 06:28:00 -0400 |
| commit | 742c52533b05d8ae83c794bd6811100675b85ce5 (patch) | |
| tree | de89a81d88c19504d1dc4f023a4b480c9022b3b5 /drivers/mtd/maps/ceiva.c | |
| parent | 36cd4fb5d277f34fe9e4db0deac2d4efd7dff735 (diff) | |
| parent | 10fec20ef5eec1c91913baec1225400f0d02df40 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/asm-arm/arch-omap/onenand.h
Diffstat (limited to 'drivers/mtd/maps/ceiva.c')
| -rw-r--r-- | drivers/mtd/maps/ceiva.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/maps/ceiva.c b/drivers/mtd/maps/ceiva.c index 6464d487eb1a..60e68bde0fea 100644 --- a/drivers/mtd/maps/ceiva.c +++ b/drivers/mtd/maps/ceiva.c | |||
| @@ -25,7 +25,7 @@ | |||
| 25 | #include <linux/mtd/partitions.h> | 25 | #include <linux/mtd/partitions.h> |
| 26 | #include <linux/mtd/concat.h> | 26 | #include <linux/mtd/concat.h> |
| 27 | 27 | ||
| 28 | #include <asm/hardware.h> | 28 | #include <mach/hardware.h> |
| 29 | #include <asm/mach-types.h> | 29 | #include <asm/mach-types.h> |
| 30 | #include <asm/io.h> | 30 | #include <asm/io.h> |
| 31 | #include <asm/sizes.h> | 31 | #include <asm/sizes.h> |