[Armadeus-commitlog] armadeus branch, master, updated. latestrelease-151-g70db9a1
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. latestrelease-151-g70db9a1
|
From: Julien B a. A. <ar...@us...> - 2009-11-19 16:04:35
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 70db9a135716bee90b209a7e6d3bef279693497a (commit)
via 93e6b71cbf9731fcd1b6cdeb946fc97979cad682 (commit)
from 2588da1dd7cfe6f6c6d035a9d911e424fc99966b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 70db9a135716bee90b209a7e6d3bef279693497a
Merge: 93e6b71cbf9731fcd1b6cdeb946fc97979cad682 2588da1dd7cfe6f6c6d035a9d911e424fc99966b
Author: Julien Boibessot <jul...@ar...>
Date: Thu Nov 19 17:02:59 2009 +0100
Merge branch 'master' of ssh://artemys@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 93e6b71cbf9731fcd1b6cdeb946fc97979cad682
Author: Julien Boibessot <jul...@ar...>
Date: Wed Oct 7 14:58:45 2009 +0200
[LINUX] Removes compilation warning in apf9328 when max1027 is not selected
-----------------------------------------------------------------------
Summary of changes:
.../2.6.29/021-armadeus-apf9328.patch | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/021-armadeus-apf9328.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/021-armadeus-apf9328.patch
index 0afb8fb..2f6dfee 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/021-armadeus-apf9328.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/021-armadeus-apf9328.patch
@@ -1,10 +1,10 @@
PATCH AUTOMATICALLY GENERATED
DON'T EDIT IT OR YOUR MODIFICATIONS WILL BE LOST
(Take a look at armadeus/target/linux/ directory to know how to generate it)
-Index: linux-2.6.29.4/arch/arm/mach-imx/apf9328.c
+Index: linux-2.6.29.6/arch/arm/mach-imx/apf9328.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.4/arch/arm/mach-imx/apf9328.c 2009-08-18 13:53:44.000000000 +0200
++++ linux-2.6.29.6/arch/arm/mach-imx/apf9328.c 2009-10-07 14:48:32.000000000 +0200
@@ -0,0 +1,635 @@
+/*
+ * linux/arch/arm/mach-imx/apf9328.c
@@ -451,8 +451,8 @@ Index: linux-2.6.29.4/arch/arm/mach-imx/apf9328.c
+#endif /* CONFIG_ARMADEUS_MAX1027 */
+
+
-+static struct spi_board_info spi_board_info[] __initdata = {
+#ifdef CONFIG_ARMADEUS_MAX1027
++static struct spi_board_info spi_board_info[] __initdata = {
+{
+ .modalias = "max1027",
+ .controller_data= &max1027_hw,
@@ -463,8 +463,8 @@ Index: linux-2.6.29.4/arch/arm/mach-imx/apf9328.c
+ .irq = IRQ_GPIOA(MAX1027_EOC_INT),
+ .platform_data = &apf9328_max1027_config,
+},
-+#endif
+};
++#endif
+
+#ifdef CONFIG_IMX_BACKLIGHT
+static struct imxbl_machinfo imx_bl_machinfo = {
@@ -641,10 +641,10 @@ Index: linux-2.6.29.4/arch/arm/mach-imx/apf9328.c
+ .timer = &imx_timer,
+ .init_machine = apf9328_init,
+MACHINE_END
-Index: linux-2.6.29.4/arch/arm/mach-imx/apf9328_lcd_config.h
+Index: linux-2.6.29.6/arch/arm/mach-imx/apf9328_lcd_config.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.4/arch/arm/mach-imx/apf9328_lcd_config.h 2009-08-17 11:04:40.000000000 +0200
++++ linux-2.6.29.6/arch/arm/mach-imx/apf9328_lcd_config.h 2009-10-02 08:54:08.000000000 +0200
@@ -0,0 +1,301 @@
+/*
+ *
@@ -947,10 +947,10 @@ Index: linux-2.6.29.4/arch/arm/mach-imx/apf9328_lcd_config.h
+#endif /* CONFIG_FB_IMX */
+
+#endif /* APF_LCD_CONFIG_H */
-Index: linux-2.6.29.4/arch/arm/mach-imx/include/mach/apf9328.h
+Index: linux-2.6.29.6/arch/arm/mach-imx/include/mach/apf9328.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.4/arch/arm/mach-imx/include/mach/apf9328.h 2009-08-18 13:55:07.000000000 +0200
++++ linux-2.6.29.6/arch/arm/mach-imx/include/mach/apf9328.h 2009-10-02 08:54:08.000000000 +0200
@@ -0,0 +1,68 @@
+/*
+ * linux/include/asm-arm/arch-imx/apf9328.h
@@ -1020,10 +1020,10 @@ Index: linux-2.6.29.4/arch/arm/mach-imx/include/mach/apf9328.h
+#endif
+
+#endif /* __ASM_ARCH_APF9328_H */
-Index: linux-2.6.29.4/arch/arm/mach-imx/apf9328-dev.c
+Index: linux-2.6.29.6/arch/arm/mach-imx/apf9328-dev.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29.4/arch/arm/mach-imx/apf9328-dev.c 2009-08-18 13:56:55.000000000 +0200
++++ linux-2.6.29.6/arch/arm/mach-imx/apf9328-dev.c 2009-10-02 08:54:08.000000000 +0200
@@ -0,0 +1,281 @@
+/*
+ * linux/arch/arm/mach-imx/apf9328-dev.c
hooks/post-receive
--
armadeus
|
