diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-12-23 03:48:41 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-12-23 03:48:41 -0500 |
| commit | 26e20a108caca6231c6a5ec659f815a866904751 (patch) | |
| tree | 36932c208a9e8994bfd7ed4eaf48b9c33f71fbe3 /drivers/mtd/maps/pxa2xx-flash.c | |
| parent | 691513f70d3957939a318da970987b876c720861 (diff) | |
| parent | 90a8a73c06cc32b609a880d48449d7083327e11a (diff) | |
Merge commit 'v2.6.37-rc7' into x86/security
Diffstat (limited to 'drivers/mtd/maps/pxa2xx-flash.c')
| -rw-r--r-- | drivers/mtd/maps/pxa2xx-flash.c | 2 |
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 { | |||
| 51 | static const char *probes[] = { "RedBoot", "cmdlinepart", NULL }; | 51 | static const char *probes[] = { "RedBoot", "cmdlinepart", NULL }; |
| 52 | 52 | ||
| 53 | 53 | ||
| 54 | static int __init pxa2xx_flash_probe(struct platform_device *pdev) | 54 | static int __devinit pxa2xx_flash_probe(struct platform_device *pdev) |
| 55 | { | 55 | { |
| 56 | struct flash_platform_data *flash = pdev->dev.platform_data; | 56 | struct flash_platform_data *flash = pdev->dev.platform_data; |
| 57 | struct pxa2xx_flash_info *info; | 57 | struct pxa2xx_flash_info *info; |