summaryrefslogtreecommitdiff
path: root/drivers/mtd/maps/vmax301.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-01-11 05:41:39 +0300
committerIngo Molnar <mingo@elte.hu>2009-01-11 05:41:39 +0300
commitabede81c4fb2e3b85d8760f25e3da39d2c69a134 (patch)
tree26c893ec108d837eb9171d678c55a1cea7b22af4 /drivers/mtd/maps/vmax301.c
parentc9d557c19f94df42db78d4a5de4d25feee694bad (diff)
parentc59765042f53a79a7a65585042ff463b69cb248c (diff)
downloadlinux-abede81c4fb2e3b85d8760f25e3da39d2c69a134.tar.xz
Merge commit 'v2.6.29-rc1' into core/urgent
Diffstat (limited to 'drivers/mtd/maps/vmax301.c')
-rw-r--r--drivers/mtd/maps/vmax301.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/maps/vmax301.c b/drivers/mtd/maps/vmax301.c
index 5a0c9a353b0f..6d452dcdfe34 100644
--- a/drivers/mtd/maps/vmax301.c
+++ b/drivers/mtd/maps/vmax301.c
@@ -146,7 +146,7 @@ static void __exit cleanup_vmax301(void)
iounmap((void *)vmax_map[0].map_priv_1 - WINDOW_START);
}
-int __init init_vmax301(void)
+static int __init init_vmax301(void)
{
int i;
unsigned long iomapadr;