git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs into for-2.6.34-incoming
[safe/jmp/linux-2.6]
/
drivers
/
mtd
/
maps
/
sa1100-flash.c
diff --git
a/drivers/mtd/maps/sa1100-flash.c
b/drivers/mtd/maps/sa1100-flash.c
index
d7a4757
..
f3af87e
100644
(file)
--- a/
drivers/mtd/maps/sa1100-flash.c
+++ b/
drivers/mtd/maps/sa1100-flash.c
@@
-248,7
+248,7
@@
static void sa1100_destroy(struct sa_info *info, struct flash_platform_data *pla
plat->exit();
}
-static struct sa_info *__init
+static struct sa_info *__
dev
init
sa1100_setup_mtd(struct platform_device *pdev, struct flash_platform_data *plat)
{
struct sa_info *info;