Index: config/machine/magician.conf
===================================================================
--- config/machine/magician.conf	(revision 364)
+++ config/machine/magician.conf	(working copy)
@@ -4,13 +4,13 @@
 [machine.builtin]
 kernel.serial.console = n
 hw.cpu.pxa27x=y
+HTC_EGPIO=y
+hw.soc.pasic3=y
 CPU_FREQ_PXA = m
 #	-pH5: modular for debugging reasons
 PXA27x_VOLTAGE=m
 PXA27x_VOLTAGE_MAX158xx=m
-HTC_EGPIO=y
 MAGICIAN_PM=y
-MAGICIAN_DS1WM=m
 MACH_MAGICIAN=y
 
 # -pH5: don't build in, make writing to flash as hard as possible
@@ -56,6 +56,7 @@
 
 [machine.keys]
 KEYBOARD_GPIO=$1
+GPIODEV_KEYS=$1
 
 [machine.battery]
 driver.subsys.power.pda = $1
@@ -67,6 +68,7 @@
 
 [machine.leds]
 LEDS_MAGICIAN=$1
+LEDS_PASIC3=$1
 
 [machine.irda]
 
Index: config/machine/hardware.conf
===================================================================
--- config/machine/hardware.conf	(revision 364)
+++ config/machine/hardware.conf	(working copy)
@@ -54,6 +54,9 @@
 [hw.soc.asic3]
 HTC_ASIC3=y
 
+[hw.soc.pasic3]
+HTC_PASIC3=y
+
 [hw.soc.samcop]
 SOC_SAMCOP=y
 SOC_SAMCOP_DMA=y