r4055 - in branches/src/target/kernel/2.6.24.x: config patches

[werner at sita.openmoko.org]

Author: werner
Date: 2008-02-13 00:51:35 +0100 (Wed, 13 Feb 2008)
New Revision: 4055

Modified:
   branches/src/target/kernel/2.6.24.x/config/defconfig-2.6.24
   branches/src/target/kernel/2.6.24.x/patches/bq27000-battery-driver.patch
Log:
Some build fixes after introduce-bq27000-battery-driver.patch

patches/bq27000-battery-driver.patch:
- arch/arm/mach-s3c2440/Kconfig: MACH_NEO1973_GTA02 also selects POWER_SUPPLY
  and BATTERY_BQ27000_HDQ
- drivers/power/Kconfig: GTA02_HDQ section ended up outside the "if ... endif"

config/defconfig-2.6.24:
- added CONFIG_POWER_SUPPLY=y and CONFIG_BATTERY_BQ27000_HDQ=y



Modified: branches/src/target/kernel/2.6.24.x/config/defconfig-2.6.24
===================================================================
--- branches/src/target/kernel/2.6.24.x/config/defconfig-2.6.24	2008-02-12 23:40:22 UTC (rev 4054)
+++ branches/src/target/kernel/2.6.24.x/config/defconfig-2.6.24	2008-02-12 23:51:35 UTC (rev 4055)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.24
-# Sun Feb 10 20:32:17 2008
+# Tue Feb 12 20:45:39 2008
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1015,7 +1015,12 @@
 # CONFIG_SPI_SPIDEV is not set
 # CONFIG_SPI_TLE62X0 is not set
 # CONFIG_W1 is not set
-# CONFIG_POWER_SUPPLY is not set
+CONFIG_POWER_SUPPLY=y
+# CONFIG_POWER_SUPPLY_DEBUG is not set
+# CONFIG_PDA_POWER is not set
+# CONFIG_APM_POWER is not set
+# CONFIG_BATTERY_DS2760 is not set
+CONFIG_BATTERY_BQ27000_HDQ=y
 CONFIG_GTA02_HDQ=y
 # CONFIG_HWMON is not set
 CONFIG_WATCHDOG=y

Modified: branches/src/target/kernel/2.6.24.x/patches/bq27000-battery-driver.patch
===================================================================
--- branches/src/target/kernel/2.6.24.x/patches/bq27000-battery-driver.patch	2008-02-12 23:40:22 UTC (rev 4054)
+++ branches/src/target/kernel/2.6.24.x/patches/bq27000-battery-driver.patch	2008-02-12 23:51:35 UTC (rev 4055)
@@ -48,18 +48,24 @@
 ===================================================================
 --- linux-2.6.24.orig/drivers/power/Kconfig
 +++ linux-2.6.24/drivers/power/Kconfig
-@@ -49,6 +49,11 @@
+@@ -49,7 +49,10 @@
  	help
  	  Say Y to enable support for the battery on the OLPC laptop.
  
+-endif # POWER_SUPPLY
 +config BATTERY_BQ27000_HDQ
 +	tristate "BQ27000 HDQ battery monitor driver"
 +	help
 +	  Say Y to enable support for the battery on the Neo Freerunner
-+
- endif # POWER_SUPPLY
  
  config GTA02_HDQ
+ 	tristate "Neo Freerunner HDQ"
+@@ -58,3 +61,5 @@
+ 	  Say Y to enable support for communicating with an HDQ battery
+ 	  on the Neo Freerunner.  You probably want to select
+ 	  at least BATTERY_BQ27000_HDQ as well
++
++endif # POWER_SUPPLY
 Index: linux-2.6.24/drivers/power/Makefile
 ===================================================================
 --- linux-2.6.24.orig/drivers/power/Makefile
@@ -468,3 +474,16 @@
 +};
 +
 +#endif
+Index: linux-2.6.24/arch/arm/mach-s3c2440/Kconfig
+===================================================================
+--- linux-2.6.24.orig/arch/arm/mach-s3c2440/Kconfig
++++ linux-2.6.24/arch/arm/mach-s3c2440/Kconfig
+@@ -85,6 +85,8 @@
+ 	bool "FIC Neo1973 GSM Phone (GTA02 Hardware)"
+ 	select CPU_S3C2442
+ 	select SENSORS_PCF50633
++	select POWER_SUPPLY
++	select GTA02_HDQ
+ 	help
+ 	   Say Y here if you are using the FIC Neo1973 GSM Phone
+