[PATCH] fix-initdata-mismatches.patch

[Werner Almesberger]

Andy Green wrote:
> Three link warnings... one left after this patch...

Ah yes, good to be rid of them. Applied in r3962.

> had a poke around
> but didn't really understand why it was __ksymtab... on this one.

I think we don't have a mechanism to have something be _init and
exported at the same time. The semantics of that would be
"interesting" anyway. (This was a bit tricky to fix, since if you
removed the __init only from the definition, it still comes in from
the declaration, making it look as if the problem was elsewhere.)

Removed the __init in r3966.

Thanks,
- Werner

---------------------------------- cut here -----------------------------------

s3c2410_touchscreen.patch:
- include/asm/arch-s3c2410/ts.h, arch/arm/plat-s3c24xx/devs.c 
  (set_s3c2410ts_info): can't be _init and exported at the same time, so we 
  remove __init

Index: linux-2.6.24/arch/arm/plat-s3c24xx/devs.c
===================================================================
--- linux-2.6.24.orig/arch/arm/plat-s3c24xx/devs.c
+++ linux-2.6.24/arch/arm/plat-s3c24xx/devs.c
@@ -218,7 +218,7 @@
 
 static struct s3c2410_ts_mach_info s3c2410ts_info;
 
-void __init set_s3c2410ts_info(struct s3c2410_ts_mach_info *hard_s3c2410ts_info)
+void set_s3c2410ts_info(struct s3c2410_ts_mach_info *hard_s3c2410ts_info)
 {
 	memcpy(&s3c2410ts_info,hard_s3c2410ts_info,sizeof(struct s3c2410_ts_mach_info));
 	s3c_device_ts.dev.platform_data = &s3c2410ts_info;
Index: linux-2.6.24/include/asm-arm/arch-s3c2410/ts.h
===================================================================
--- linux-2.6.24.orig/include/asm-arm/arch-s3c2410/ts.h
+++ linux-2.6.24/include/asm-arm/arch-s3c2410/ts.h
@@ -22,7 +22,7 @@
        int             oversampling_shift;
 };
 
-void __init set_s3c2410ts_info(struct s3c2410_ts_mach_info *hard_s3c2410ts_info);
+void set_s3c2410ts_info(struct s3c2410_ts_mach_info *hard_s3c2410ts_info);
 
 #endif /* __ASM_ARM_TS_H */