[Balloon-svn] r496 - balloon/trunk/kernel/2.6.25.2

Author: wookey
Date: 2008-09-29 13:05:23 +0100 (Mon, 29 Sep 2008)
New Revision: 496

Modified:
balloon/trunk/kernel/2.6.25.2/balloon3.patch
Log:
Add missing i2c device.


Modified: balloon/trunk/kernel/2.6.25.2/balloon3.patch
===================================================================
--- balloon/trunk/kernel/2.6.25.2/balloon3.patch    2008-07-08 11:07:46 UTC (rev 495)
+++ balloon/trunk/kernel/2.6.25.2/balloon3.patch    2008-09-29 12:05:23 UTC (rev 496)
@@ -1,7 +1,7 @@
Index: include/asm-arm/arch-pxa/debug-macro.S
===================================================================
---- include/asm-arm/arch-pxa/debug-macro.S.orig    2008-05-09 18:09:23.000000000 +0100
-+++ include/asm-arm/arch-pxa/debug-macro.S    2008-05-09 18:09:28.000000000 +0100
+--- include/asm-arm/arch-pxa/debug-macro.S.orig    2008-09-29 13:01:03.000000000 +0100
++++ include/asm-arm/arch-pxa/debug-macro.S    2008-09-29 13:01:08.000000000 +0100
@@ -18,7 +18,11 @@
        tst    \rx, #1            @ MMU enabled?
        moveq    \rx, #0x40000000        @ physical
@@ -17,7 +17,7 @@
Index: include/asm-arm/arch-pxa/balloon3.h
===================================================================
--- /dev/null    1970-01-01 00:00:00.000000000 +0000
-+++ include/asm-arm/arch-pxa/balloon3.h    2008-05-09 18:09:28.000000000 +0100
++++ include/asm-arm/arch-pxa/balloon3.h    2008-09-29 13:01:08.000000000 +0100
@@ -0,0 +1,133 @@
+/*
+ * linux/include/asm-arm/arch-pxa/balloon3.h
@@ -154,8 +154,8 @@
+#endif
Index: include/asm-arm/arch-pxa/irqs.h
===================================================================
---- include/asm-arm/arch-pxa/irqs.h.orig    2008-05-09 18:09:23.000000000 +0100
-+++ include/asm-arm/arch-pxa/irqs.h    2008-05-09 18:09:28.000000000 +0100
+--- include/asm-arm/arch-pxa/irqs.h.orig    2008-09-29 13:01:03.000000000 +0100
++++ include/asm-arm/arch-pxa/irqs.h    2008-09-29 13:01:08.000000000 +0100
@@ -181,7 +181,8 @@
#elif defined(CONFIG_ARCH_LUBBOCK) || \
defined(CONFIG_MACH_LOGICPD_PXA270) || \
@@ -208,8 +208,8 @@
#define IRQ_LOCOMO_GPIO_BASE    (IRQ_BOARD_START + 1)
Index: include/asm-arm/arch-pxa/uncompress.h
===================================================================
---- include/asm-arm/arch-pxa/uncompress.h.orig    2008-05-09 18:09:23.000000000 +0100
-+++ include/asm-arm/arch-pxa/uncompress.h    2008-05-09 18:09:28.000000000 +0100
+--- include/asm-arm/arch-pxa/uncompress.h.orig    2008-09-29 13:01:03.000000000 +0100
++++ include/asm-arm/arch-pxa/uncompress.h    2008-09-29 13:01:08.000000000 +0100
@@ -14,7 +14,11 @@

#define __REG(x)    ((volatile unsigned long *)x)
@@ -224,8 +224,8 @@
static inline void putc(char c)
Index: arch/arm/mach-pxa/Kconfig
===================================================================
---- arch/arm/mach-pxa/Kconfig.orig    2008-05-09 18:09:23.000000000 +0100
-+++ arch/arm/mach-pxa/Kconfig    2008-05-09 18:09:28.000000000 +0100
+--- arch/arm/mach-pxa/Kconfig.orig    2008-09-29 13:01:03.000000000 +0100
++++ arch/arm/mach-pxa/Kconfig    2008-09-29 13:01:08.000000000 +0100
@@ -36,6 +36,11 @@
    bool "Intel HCDDBBVA0 Development Platform"
    select PXA27x
@@ -256,8 +256,8 @@
Index: arch/arm/mach-pxa/balloon3.c
===================================================================
--- /dev/null    1970-01-01 00:00:00.000000000 +0000
-+++ arch/arm/mach-pxa/balloon3.c    2008-05-09 18:12:07.000000000 +0100
-@@ -0,0 +1,476 @@
++++ arch/arm/mach-pxa/balloon3.c    2008-09-29 13:03:30.000000000 +0100
+@@ -0,0 +1,477 @@
+/*
+ * linux/arch/arm/mach-pxa/balloon3.c
+ *
@@ -308,7 +308,7 @@
+#include <asm/arch/ohci.h>
+
+#include "generic.h"
-+
++#include "devices.h"
+#define putstr(x) printk(x)
+
+static unsigned long balloon3_irq_enabled;
@@ -605,6 +605,7 @@
+
+static struct platform_device *platform_devices[] __initdata = {
+    &balloon3_audio_device,
++ &pxa_device_i2c,
+//    &mst_flash_device[0],
+//    &mst_flash_device[1],
+};
@@ -736,8 +737,8 @@
+MACHINE_END
Index: arch/arm/Kconfig
===================================================================
---- arch/arm/Kconfig.orig    2008-05-09 18:09:23.000000000 +0100
-+++ arch/arm/Kconfig    2008-05-09 18:09:28.000000000 +0100
+--- arch/arm/Kconfig.orig    2008-09-29 13:01:03.000000000 +0100
++++ arch/arm/Kconfig    2008-09-29 13:01:08.000000000 +0100
@@ -790,7 +790,7 @@
         ARCH_OMAP || ARCH_P720T || ARCH_PXA_IDP || \
         ARCH_SA1100 || ARCH_SHARK || ARCH_VERSATILE || \
@@ -749,8 +750,8 @@
     to provide useful information about your current system status.
Index: arch/arm/mach-pxa/Makefile
===================================================================
---- arch/arm/mach-pxa/Makefile.orig    2008-05-09 18:09:23.000000000 +0100
-+++ arch/arm/mach-pxa/Makefile    2008-05-09 18:09:28.000000000 +0100
+--- arch/arm/mach-pxa/Makefile.orig    2008-09-29 13:01:03.000000000 +0100
++++ arch/arm/mach-pxa/Makefile    2008-09-29 13:01:08.000000000 +0100
@@ -15,6 +15,7 @@
obj-$(CONFIG_ARCH_LUBBOCK)    += lubbock.o
obj-$(CONFIG_MACH_LOGICPD_PXA270) += lpd270.o
@@ -761,8 +762,8 @@
obj-$(CONFIG_MACH_COLIBRI)    += colibri.o
Index: Makefile
===================================================================
---- Makefile.orig    2008-05-09 18:09:23.000000000 +0100
-+++ Makefile    2008-05-09 18:09:28.000000000 +0100
+--- Makefile.orig    2008-09-29 13:01:03.000000000 +0100
++++ Makefile    2008-09-29 13:01:08.000000000 +0100
@@ -190,8 +190,8 @@
# Default value for CROSS_COMPILE is not to prefix executables
# Note: Some architectures assign CROSS_COMPILE in their arch/*/Makefile