git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.infradead.org/mtd-2.6
[sfrench/cifs-2.6.git]
/
drivers
/
mtd
/
maps
/
sa1100-flash.c
diff --git
a/drivers/mtd/maps/sa1100-flash.c
b/drivers/mtd/maps/sa1100-flash.c
index 6f6a0f6dafd6106b9042f27d892758ecee45916c..05e9362dc7f0fdd252d7c7ecb5d6922cf000de98 100644
(file)
--- a/
drivers/mtd/maps/sa1100-flash.c
+++ b/
drivers/mtd/maps/sa1100-flash.c
@@
-12,6
+12,7
@@
#include <linux/slab.h>
#include <linux/platform_device.h>
#include <linux/err.h>
#include <linux/slab.h>
#include <linux/platform_device.h>
#include <linux/err.h>
+#include <linux/io.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/map.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/map.h>
@@
-19,7
+20,6
@@
#include <linux/mtd/concat.h>
#include <mach/hardware.h>
#include <linux/mtd/concat.h>
#include <mach/hardware.h>
-#include <asm/io.h>
#include <asm/sizes.h>
#include <asm/mach/flash.h>
#include <asm/sizes.h>
#include <asm/mach/flash.h>
@@
-351,7
+351,7
@@
sa1100_setup_mtd(struct platform_device *pdev, struct flash_platform_data *plat)
static const char *part_probes[] = { "cmdlinepart", "RedBoot", NULL };
static const char *part_probes[] = { "cmdlinepart", "RedBoot", NULL };
-static int __init sa1100_mtd_probe(struct platform_device *pdev)
+static int __
dev
init sa1100_mtd_probe(struct platform_device *pdev)
{
struct flash_platform_data *plat = pdev->dev.platform_data;
struct mtd_partition *parts;
{
struct flash_platform_data *plat = pdev->dev.platform_data;
struct mtd_partition *parts;