6 files changed, 15 insertions, 6 deletions
diff --git a/packages/linux/linux-omap/0011-DSS-Support-for-OMAP3-EVM-board.patch b/packages/linux/linux-omap/0011-DSS-Support-for-OMAP3-EVM-board.patch
index a8aa8f6e1b..bd83a36f4f 100644
--- a/packages/linux/linux-omap/0011-DSS-Support-for-OMAP3-EVM-board.patch
+++ b/packages/linux/linux-omap/0011-DSS-Support-for-OMAP3-EVM-board.patch
@@ -154,7 +154,7 @@ index e4e60e2..7756dd8 100644
 +		twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER, 0x0,
 +				TWL4030_VPLL2_DEV_GRP);
 +	}
-+	omap_set_gpio_dataout(LCD_PANEL_ENABLE_GPIO, 1);
++	gpio_direction_output(LCD_PANEL_ENABLE_GPIO, 1);
 +	lcd_enabled = 0;
 +}
 +
diff --git a/packages/linux/linux-omap_git.bb b/packages/linux/linux-omap_git.bb
index 332748a423..be5519a081 100644
--- a/packages/linux/linux-omap_git.bb
+++ b/packages/linux/linux-omap_git.bb
@@ -6,11 +6,11 @@ KERNEL_IMAGETYPE = "uImage"
 COMPATIBLE_MACHINE = "omap5912osk|omap1710h3|omap2430sdp|omap2420h4|beagleboard|omap3evm"
 
 
-SRCREV = "014ba70469e889ebb74516052c43fd06a419b17b"
+SRCREV = "694653afe8eb75191734cd4e6477c3182cf880b7"
 
 PV = "2.6.27+2.6.28-rc7+${PR}+gitr${SRCREV}"
 #PV = "2.6.27+${PR}+gitr${SRCREV}"
-PR = "r7"
+PR = "r8"
 
 SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git;protocol=git \
 	   file://defconfig"
diff --git a/packages/linux/linux-openmoko-devel_git.bb b/packages/linux/linux-openmoko-devel_git.bb
index 73ce09a2ee..a1b91e5425 100644
--- a/packages/linux/linux-openmoko-devel_git.bb
+++ b/packages/linux/linux-openmoko-devel_git.bb
@@ -18,6 +18,6 @@ SRC_URI = "\
 S = "${WORKDIR}/git"
 
 do_configure_prepend() {
-	install -m 644 cp ./arch/arm/configs/gta02_defconfig ${WORKDIR}/defconfig-oe 
+	install -m 644 ./arch/arm/configs/gta02-moredrivers-defconfig ${WORKDIR}/defconfig-oe 
 }
 
diff --git a/packages/linux/linux-openmoko.inc b/packages/linux/linux-openmoko.inc
index 3a6589791e..781579be93 100644
--- a/packages/linux/linux-openmoko.inc
+++ b/packages/linux/linux-openmoko.inc
@@ -38,8 +38,16 @@ do_configure_prepend() {
                 echo -n "fixing up configuration for Openmoko GTA01..."
                 sed -i -e s,CONFIG_S3C_LOWLEVEL_UART_PORT=2,CONFIG_S3C_LOWLEVEL_UART_PORT=0, ${WORKDIR}/defconfig
                 sed -i -e s,CONFIG_DEBUG_S3C_UART=2,CONFIG_DEBUG_S3C_UART=0, ${WORKDIR}/defconfig
+                echo "# CONFIG_BATTERY_BQ27000_HDQ is not set" >>${WORKDIR}/defconfig
+                echo "CONFIG_BATTERY_GTA01=y" >>${WORKDIR}/defconfig
                 echo "done"
         fi
+        if [ ${MACHINE} == "om-gta02" ]; then
+                echo -n "fixing up configuration for Openmoko GTA02..."
+                echo "CONFIG_BATTERY_BQ27000_HDQ=y" >>${WORKDIR}/defconfig
+                echo "# CONFIG_BATTERY_GTA01 is not set" >>${WORKDIR}/defconfig
+                echo "done"
+        fi                                                                       
 }
 
 # symlink the latest uImage (should go to linux.inc IMO)
diff --git a/packages/linux/linux-openmoko/defconfig-oe b/packages/linux/linux-openmoko/defconfig-oe
index 30cf97adc9..5b8fb3776a 100644
--- a/packages/linux/linux-openmoko/defconfig-oe
+++ b/packages/linux/linux-openmoko/defconfig-oe
@@ -1023,8 +1023,9 @@ CONFIG_POWER_SUPPLY=y
 # CONFIG_PDA_POWER is not set
 # CONFIG_APM_POWER is not set
 # CONFIG_BATTERY_DS2760 is not set
-CONFIG_BATTERY_BQ27000_HDQ=y
+### override CONFIG_BATTERY_BQ27000_HDQ=y
 CONFIG_GTA02_HDQ=y
+### override CONFIG_BATTERY_GTA01=y
 # CONFIG_HWMON is not set
 CONFIG_WATCHDOG=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
diff --git a/packages/linux/linux-openmoko_2.6.24+git.bb b/packages/linux/linux-openmoko_2.6.24+git.bb
index 7e00f6ab18..134542a43d 100644
--- a/packages/linux/linux-openmoko_2.6.24+git.bb
+++ b/packages/linux/linux-openmoko_2.6.24+git.bb
@@ -6,7 +6,7 @@ DESCRIPTION = "The Linux kernel for the Openmoko devices GTA01 (Neo1973) and GTA
 KERNEL_RELEASE = "2.6.24"
 KERNEL_VERSION = "${KERNEL_RELEASE}"
 
-OEV = "oe1"
+OEV = "oe2"
 PV = "${KERNEL_RELEASE}-${OEV}+gitr${SRCREV}"
 PR = "r0"