diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2009-10-20 01:38:34 +0200 |
|---|---|---|
| committer | Lars-Peter Clausen <lars@metafoo.de> | 2009-10-20 01:38:34 +0200 |
| commit | ee6baee93c67d4022c756642725e9985fbfd8332 (patch) | |
| tree | eb4b6c0d226f9c121c5b294049e27aeeefdde1c6 | |
| parent | 44609939f2b6a07973f21424f038423402e0ef4d (diff) | |
| parent | 37715953219910e604fb6514ade8db2722af1c0c (diff) | |
Merge branch 'gta01-machine-2.6.31' into om-gta01-2.6.31
| -rw-r--r-- | arch/arm/mach-s3c2410/mach-gta01.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-s3c2410/mach-gta01.c b/arch/arm/mach-s3c2410/mach-gta01.c index 3f0c7c03e5f..c559a28d442 100644 --- a/arch/arm/mach-s3c2410/mach-gta01.c +++ b/arch/arm/mach-s3c2410/mach-gta01.c @@ -286,7 +286,7 @@ static struct platform_device gta01_bat = { }; #endif -static void gta01_pcf_probe_done(struct pcf50606 *pcf) +static void __devinit gta01_pcf_probe_done(struct pcf50606 *pcf) { gta01_pcf = pcf; @@ -840,11 +840,11 @@ static struct platform_device *gta01_devices[] __initdata = { >a01_pm_gsm_dev, }; -static struct platform_device *gta01_pmu_child_devices[] __initdata = { +static struct platform_device *gta01_pmu_child_devices[] __devinitdata = { >a01_lcm_spigpio_device, }; -static void gta01_pmu_attach_child_devices(struct pcf50606 *pcf) +static void __devinit gta01_pmu_attach_child_devices(struct pcf50606 *pcf) { size_t i; |