diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-10-30 21:37:12 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-30 21:37:12 -0500 |
| commit | 23fd07750a789a66fe88cf173d52a18f1a387da4 (patch) | |
| tree | 06fdd6df35fdb835abdaa9b754d62f6b84b97250 /drivers/mtd/maps/epxa10db-flash.c | |
| parent | bd787d438a59266af3c9f6351644c85ef1dd21fe (diff) | |
| parent | ed28f96ac1960f30f818374d65be71d2fdf811b0 (diff) | |
Merge ../linux-2.6 by hand
Diffstat (limited to 'drivers/mtd/maps/epxa10db-flash.c')
| -rw-r--r-- | drivers/mtd/maps/epxa10db-flash.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/mtd/maps/epxa10db-flash.c b/drivers/mtd/maps/epxa10db-flash.c index ab6dbe2b8cce..1df6188926b3 100644 --- a/drivers/mtd/maps/epxa10db-flash.c +++ b/drivers/mtd/maps/epxa10db-flash.c | |||
| @@ -27,12 +27,15 @@ | |||
| 27 | #include <linux/types.h> | 27 | #include <linux/types.h> |
| 28 | #include <linux/kernel.h> | 28 | #include <linux/kernel.h> |
| 29 | #include <linux/init.h> | 29 | #include <linux/init.h> |
| 30 | #include <asm/io.h> | 30 | #include <linux/slab.h> |
| 31 | |||
| 31 | #include <linux/mtd/mtd.h> | 32 | #include <linux/mtd/mtd.h> |
| 32 | #include <linux/mtd/map.h> | 33 | #include <linux/mtd/map.h> |
| 33 | #include <linux/mtd/partitions.h> | 34 | #include <linux/mtd/partitions.h> |
| 34 | 35 | ||
| 36 | #include <asm/io.h> | ||
| 35 | #include <asm/hardware.h> | 37 | #include <asm/hardware.h> |
| 38 | |||
| 36 | #ifdef CONFIG_EPXA10DB | 39 | #ifdef CONFIG_EPXA10DB |
| 37 | #define BOARD_NAME "EPXA10DB" | 40 | #define BOARD_NAME "EPXA10DB" |
| 38 | #else | 41 | #else |