Index: config/machine/crossport.conf
===================================================================
--- config/machine/crossport.conf	(revision 276)
+++ config/machine/crossport.conf	(working copy)
@@ -41,11 +41,10 @@
 [driver.battery.ds2760]
 kernel.subsys.w1=$1
 W1_MASTER_DS1WM = $1
-W1_DS2760=$1
-DS2760_BATTERY=$1
+W1_SLAVE_DS2760=$1
+BATTERY_DS2760=$1
 
 [driver.subsys.power.pda]
-BATTERY = $1
-EXTERNAL_POWER = $1
+POWER_SUPPLY = $1
 APM_POWER = $1
 PDA_POWER = $1