diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-10-31 17:36:11 +0100 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-10-31 17:36:11 +0100 |
| commit | 53b2ec5518aa2623e8c0cb36f1c304a797988a46 (patch) | |
| tree | 465d8631ade6c2fcbd7576ff9813d00116c6a1e8 /drivers/mtd/maps/mainstone-flash.c | |
| parent | [CIFS] Change pragma pack(1) to attribute(packed) to allow cifs on arm to access (diff) | |
| parent | [PATCH] noop-iosched: avoid corrupted request merging (diff) | |
| download | linux-53b2ec5518aa2623e8c0cb36f1c304a797988a46.tar.xz linux-53b2ec5518aa2623e8c0cb36f1c304a797988a46.zip | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/mtd/maps/mainstone-flash.c')
| -rw-r--r-- | drivers/mtd/maps/mainstone-flash.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/mtd/maps/mainstone-flash.c b/drivers/mtd/maps/mainstone-flash.c index 87e93fa60588..da0f8a692628 100644 --- a/drivers/mtd/maps/mainstone-flash.c +++ b/drivers/mtd/maps/mainstone-flash.c @@ -16,9 +16,12 @@ #include <linux/kernel.h> #include <linux/init.h> #include <linux/dma-mapping.h> +#include <linux/slab.h> + #include <linux/mtd/mtd.h> #include <linux/mtd/map.h> #include <linux/mtd/partitions.h> + #include <asm/io.h> #include <asm/hardware.h> #include <asm/arch/pxa-regs.h> |