2.6.29-rc2 rebase in git

[Werner Almesberger]

Andy Green wrote:
> andy-tracking is now on 2.6.29-rc2 via Ben Dooks' tree.

Great work !

> The lesson here seems like it might be to reduce the "impedence
> mismatch" for the incoming upstream code to zero before doing the rebase.

Yeah, that's the little brother of the "we can let it diverge but then
it'll kill Andy when it comes back from upstream" scenario we discussed
a year ago. Good that we didn't get the full version :)

> http://git.openmoko.org/?p=kernel.git;a=commitdiff;h=d5119bd8f7a606c9e05b022a703b9df7dcc14730

Thanks !

One small problem: arch/arm/plat-s3c24xx/neo1973_pm_gps.c wants to
include linux/mfd/pcf50606/core.h and linux/mfd/pcf50606/gpo.h, which
both don't exist. I get a successful compile with gta02-moredrivers
if I just comment out the includes, but that probably breaks GTA01.
Did these files perhaps just not get committed ?

- Werner

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

Here's my probably incorrect work-around.

diff --git a/arch/arm/plat-s3c24xx/neo1973_pm_gps.c b/arch/arm/plat-s3c24xx/neo1973_pm_gps.c
index 84785df..652f9e8 100644
--- a/arch/arm/plat-s3c24xx/neo1973_pm_gps.c
+++ b/arch/arm/plat-s3c24xx/neo1973_pm_gps.c
@@ -25,8 +25,10 @@
 
 /* For GTA01 */
 #include <mach/gta01.h>
+#if 0
 #include <linux/mfd/pcf50606/core.h>
 #include <linux/mfd/pcf50606/gpo.h>
+#endif
 
 /* For GTA02 */
 #include <mach/gta02.h>