summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-12-13 02:45:39 +0300
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-12-13 02:45:39 +0300
commit819c1a651fec6b370211609ce6eceefd20cf31e4 (patch)
treeabfe2a3c84e4987f71ea9b71a0bc771c2c7f2a50 /drivers
parent440e2e4759805437f89f7eda78de72cb46729d04 (diff)
parent9f1ee150fc7039eb65039ab17d9a95dfa6250133 (diff)
downloadlinux-819c1a651fec6b370211609ce6eceefd20cf31e4.tar.xz
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mtd/maps/pxa2xx-flash.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/maps/pxa2xx-flash.c b/drivers/mtd/maps/pxa2xx-flash.c
index dd90880048cf..d8ae634d347e 100644
--- a/drivers/mtd/maps/pxa2xx-flash.c
+++ b/drivers/mtd/maps/pxa2xx-flash.c
@@ -51,7 +51,7 @@ struct pxa2xx_flash_info {
static const char *probes[] = { "RedBoot", "cmdlinepart", NULL };
-static int __init pxa2xx_flash_probe(struct platform_device *pdev)
+static int __devinit pxa2xx_flash_probe(struct platform_device *pdev)
{
struct flash_platform_data *flash = pdev->dev.platform_data;
struct pxa2xx_flash_info *info;