merge of '24a6bbd3a00726598e9a364df32f1abdff8750bf'

     and '30bf52d6fbef1c40328bf96f24a20f1a6d9981a7'

3 files changed, 56 insertions, 18 deletions

diff --git a/conf/machine/palmz72.conf b/conf/machine/palmz72.conf
index 85bce509b1..ae3e74bee4 100644
--- a/conf/machine/palmz72.conf
+++ b/conf/machine/palmz72.conf
@@ -22,3 +22,4 @@ require conf/machine/include/tune-xscale.conf
 require conf/machine/include/tune-thumb.conf
 
 module_autoload_sa1100-rtc = "sa1100-rtc"
+module_autoload_palmz72-battery = "palmz72-battery"
diff --git a/packages/linux/linux-hackndev-2.6/palmz72/defconfig b/packages/linux/linux-hackndev-2.6/palmz72/defconfig
index db628a2424..c31d272ac6 100644
--- a/packages/linux/linux-hackndev-2.6/palmz72/defconfig
+++ b/packages/linux/linux-hackndev-2.6/palmz72/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.17-hnd0
-# Thu Jan 18 12:36:38 2007
+# Sat Feb  3 23:56:17 2007
 #
 CONFIG_ARM=y
 CONFIG_MMU=y
@@ -143,23 +143,24 @@ CONFIG_ARCH_PXA=y
 # CONFIG_MACH_XSCALE_PALMLD is not set
 # CONFIG_MACH_XSCALE_PALMTREO650 is not set
 # CONFIG_MACH_XSCALE_TREO680 is not set
+# CONFIG_MACH_T700WX is not set
 # CONFIG_MACH_TUNGE2 is not set
 # CONFIG_MACH_T3XSCALE is not set
 # CONFIG_MACH_XSCALE_PALMTT5 is not set
 # CONFIG_MACH_XSCALE_PALMTX is not set
 CONFIG_MACH_PALMZ72=y
-CONFIG_PALMZ72_AC97=y
 CONFIG_PALMZ72_PM=y
+CONFIG_PALMZ72_BATTERY=m
 CONFIG_GPIOED=m
 CONFIG_GPIOEDNG=m
 # CONFIG_MACH_OMAP_PALMTC is not set
+# CONFIG_MACH_ZIRE31 is not set
 # CONFIG_PXA_SHARPSL is not set
 CONFIG_PXA27x=y
 CONFIG_PXA_RTC_EPOCH=1970
 # CONFIG_SA1100_H3100 is not set
 # CONFIG_SA1100_H3600 is not set
 # CONFIG_SA1100_H3800 is not set
-# CONFIG_GPIO_KEYS is not set
 
 #
 # Linux As Bootloader
@@ -253,7 +254,6 @@ CONFIG_FPE_NWFPE=y
 CONFIG_BINFMT_ELF=y
 # CONFIG_BINFMT_AOUT is not set
 # CONFIG_BINFMT_MISC is not set
-# CONFIG_ARTHUR is not set
 
 #
 # Power management options
@@ -335,7 +335,7 @@ CONFIG_TCP_CONG_BIC=y
 #
 # CONFIG_NET_PKTGEN is not set
 # CONFIG_HAMRADIO is not set
-CONFIG_IRDA=y
+CONFIG_IRDA=m
 
 #
 # IrDA protocols
@@ -359,7 +359,7 @@ CONFIG_IRDA=y
 #
 # SIR device drivers
 #
-CONFIG_IRTTY_SIR=y
+CONFIG_IRTTY_SIR=m
 
 #
 # Dongle support
@@ -378,24 +378,23 @@ CONFIG_IRTTY_SIR=y
 #
 # FIR device drivers
 #
-CONFIG_PXA_FICP=y
-CONFIG_BT=y
+CONFIG_PXA_FICP=m
+CONFIG_BT=m
 # CONFIG_BT_L2CAP is not set
 # CONFIG_BT_SCO is not set
 
 #
 # Bluetooth device drivers
 #
-CONFIG_BT_HCIUART=y
+CONFIG_BT_HCIUART=m
 # CONFIG_BT_HCIUART_H4 is not set
 # CONFIG_BT_HCIUART_BCSP is not set
-# CONFIG_BT_HCIBCM203X is not set
 # CONFIG_BT_HCIVHCI is not set
-CONFIG_IEEE80211=y
+CONFIG_IEEE80211=m
 # CONFIG_IEEE80211_DEBUG is not set
-# CONFIG_IEEE80211_CRYPT_WEP is not set
-# CONFIG_IEEE80211_CRYPT_CCMP is not set
-CONFIG_IEEE80211_SOFTMAC=y
+CONFIG_IEEE80211_CRYPT_WEP=m
+CONFIG_IEEE80211_CRYPT_CCMP=m
+CONFIG_IEEE80211_SOFTMAC=m
 # CONFIG_IEEE80211_SOFTMAC_DEBUG is not set
 CONFIG_WIRELESS_EXT=y
 
@@ -540,6 +539,10 @@ CONFIG_PPP=y
 #
 CONFIG_INPUT=y
 
+#
+# Userland interfaces
+#
+# CONFIG_INPUT_MOUSEDEV is not set
 # CONFIG_INPUT_JOYDEV is not set
 CONFIG_INPUT_TSDEV=y
 CONFIG_INPUT_TSDEV_SCREEN_X=320
@@ -559,10 +562,20 @@ CONFIG_INPUT_KEYBOARD=y
 # CONFIG_KEYBOARD_STOWAWAY is not set
 CONFIG_KEYBOARD_PXA27x=y
 # CONFIG_KEYBOARD_PALMIR is not set
-CONFIG_KEYBOARD_PALMWK=y
+CONFIG_KEYBOARD_PALMWK=m
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_INPUT_JOYSTICK is not set
-# CONFIG_INPUT_TOUCHSCREEN is not set
+CONFIG_INPUT_TOUCHSCREEN=y
+# CONFIG_TOUCHSCREEN_ADS7846 is not set
+# CONFIG_TOUCHSCREEN_GUNZE is not set
+# CONFIG_TOUCHSCREEN_ELO is not set
+# CONFIG_TOUCHSCREEN_MTOUCH is not set
+# CONFIG_TOUCHSCREEN_MK712 is not set
+CONFIG_TOUCHSCREEN_WM97XX=y
+# CONFIG_TOUCHSCREEN_WM9705 is not set
+CONFIG_TOUCHSCREEN_WM9712=y
+# CONFIG_TOUCHSCREEN_WM9713 is not set
+# CONFIG_TOUCHSCREEN_WM97XX_PXA is not set
 # CONFIG_INPUT_MISC is not set
 
 #
@@ -1068,7 +1081,31 @@ CONFIG_FRAME_POINTER=y
 #
 # Cryptographic options
 #
-# CONFIG_CRYPTO is not set
+CONFIG_CRYPTO=y
+# CONFIG_CRYPTO_HMAC is not set
+# CONFIG_CRYPTO_NULL is not set
+# CONFIG_CRYPTO_MD4 is not set
+# CONFIG_CRYPTO_MD5 is not set
+# CONFIG_CRYPTO_SHA1 is not set
+# CONFIG_CRYPTO_SHA256 is not set
+# CONFIG_CRYPTO_SHA512 is not set
+# CONFIG_CRYPTO_WP512 is not set
+# CONFIG_CRYPTO_TGR192 is not set
+# CONFIG_CRYPTO_DES is not set
+# CONFIG_CRYPTO_BLOWFISH is not set
+# CONFIG_CRYPTO_TWOFISH is not set
+# CONFIG_CRYPTO_SERPENT is not set
+CONFIG_CRYPTO_AES=m
+# CONFIG_CRYPTO_CAST5 is not set
+# CONFIG_CRYPTO_CAST6 is not set
+# CONFIG_CRYPTO_TEA is not set
+CONFIG_CRYPTO_ARC4=m
+# CONFIG_CRYPTO_KHAZAD is not set
+# CONFIG_CRYPTO_ANUBIS is not set
+# CONFIG_CRYPTO_DEFLATE is not set
+# CONFIG_CRYPTO_MICHAEL_MIC is not set
+# CONFIG_CRYPTO_CRC32C is not set
+# CONFIG_CRYPTO_TEST is not set
 
 #
 # Hardware crypto devices
diff --git a/packages/linux/linux-hackndev-2.6_svn.bb b/packages/linux/linux-hackndev-2.6_svn.bb
index 7ef5ad581e..427923af2c 100644
--- a/packages/linux/linux-hackndev-2.6_svn.bb
+++ b/packages/linux/linux-hackndev-2.6_svn.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Hack&Dev's Linux kernel for Palm devices."
 HOMEPAGE = "http://www.hackndev.com/"
 SECTION = "kernel"
 LICENSE = "GPL"
-PR = "r1"
+PR = "r2"
 
 COMPATIBLE_MACHINE = "(palmtx|palmld|palmz72)"