htcdiamond, htcraphael: update machine configs and kernel defconfigs

diff --git a/conf/machine/htcdiamond.conf b/conf/machine/htcdiamond.conf
index 393c1ee..e4b07ea 100644 (file)
--- a/conf/machine/htcdiamond.conf
+++ b/conf/machine/htcdiamond.conf
@@ -10,6 +10,6 @@ XSERVER = "xserver-kdrive-fbdev"
 MACHINE_DISPLAY_WIDTH_PIXELS = "480"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
 
-MACHINE_FEATURES = "kernel26 touchscreen screen phone gps"
+MACHINE_FEATURES = "kernel26 touchscreen screen phone gps usb"
 
 IMAGE_FSTYPES += "tar.gz cpio.gz"

diff --git a/conf/machine/htcraphael.conf b/conf/machine/htcraphael.conf
index 3ab87be..ad43297 100644 (file)
--- a/conf/machine/htcraphael.conf
+++ b/conf/machine/htcraphael.conf
@@ -10,6 +10,6 @@ XSERVER = "xserver-kdrive-fbdev"
 MACHINE_DISPLAY_WIDTH_PIXELS = "480"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
 
-MACHINE_FEATURES = "kernel26 touchscreen screen keyboard phone gps"
+MACHINE_FEATURES = "kernel26 touchscreen screen phone gps usb keyboard"
 
 IMAGE_FSTYPES += "tar.gz cpio.gz"

diff --git a/packages/linux/linux-msm7xxxx/htcdiamond/defconfig b/packages/linux/linux-msm7xxxx/htcdiamond/defconfig
index ebe3131..930a1e1 100644 (file)
--- a/packages/linux/linux-msm7xxxx/htcdiamond/defconfig
+++ b/packages/linux/linux-msm7xxxx/htcdiamond/defconfig
@@ -845,7 +845,7 @@ CONFIG_USB_FUNCTION_ADB=y
 # CONFIG_USB_FUNCTION_UMS is not set
 CONFIG_USB_FUNCTION_MASS_STORAGE=y
 CONFIG_USB_FUNCTION_DIAG=y
-# CONFIG_USB_FUNCTION_ETHER is not set
+CONFIG_USB_FUNCTION_ETHER=y
 CONFIG_MMC=y
 # CONFIG_MMC_DEBUG is not set
 CONFIG_MMC_UNSAFE_RESUME=y

diff --git a/packages/linux/linux-msm7xxxx/htcraphael/defconfig b/packages/linux/linux-msm7xxxx/htcraphael/defconfig
index ebe3131..930a1e1 100644 (file)
--- a/packages/linux/linux-msm7xxxx/htcraphael/defconfig
+++ b/packages/linux/linux-msm7xxxx/htcraphael/defconfig
@@ -845,7 +845,7 @@ CONFIG_USB_FUNCTION_ADB=y
 # CONFIG_USB_FUNCTION_UMS is not set
 CONFIG_USB_FUNCTION_MASS_STORAGE=y
 CONFIG_USB_FUNCTION_DIAG=y
-# CONFIG_USB_FUNCTION_ETHER is not set
+CONFIG_USB_FUNCTION_ETHER=y
 CONFIG_MMC=y
 # CONFIG_MMC_DEBUG is not set
 CONFIG_MMC_UNSAFE_RESUME=y

diff --git a/packages/linux/linux-msm7xxxx_git.bb b/packages/linux/linux-msm7xxxx_git.bb
index 8600110..3c5996d 100644 (file)
--- a/packages/linux/linux-msm7xxxx_git.bb
+++ b/packages/linux/linux-msm7xxxx_git.bb
@@ -10,9 +10,9 @@ COMPATIBLE_MACHINE = "htckaiser|htcpolaris|htcraphael|htcdiamond|htcvogue|htctit
 
 SRCREV_htckaiser = "1082670ccae30e6592311cc9dee93ba978382a25"
 SRCREV_htcpolaris = "1082670ccae30e6592311cc9dee93ba978382a25"
-SRCREV_htcraphael = "6ec22f1385dcc2ca15d08361657a0b14821534b8"
-SRCREV_htcdiamond = "6ec22f1385dcc2ca15d08361657a0b14821534b8"
-SRCREV_htcvogue = "7904ce5c8b7da40548a159f5fe02d11fa3d3cb77"
+SRCREV_htcraphael = "b72564e5359a9d3d232cabc385de4e95dfe7a042"
+SRCREV_htcdiamond = "b72564e5359a9d3d232cabc385de4e95dfe7a042"
+SRCREV_htcvogue = "e73c363e32f9fd9b1f4e11a8fec1dcc1fdd19ffc"
 
 SRC_URI = "git://git.linuxtogo.org/home/groups/mobile-linux/kernel.git;branch=htc-msm-2.6.25;protocol=git file://defconfig"
 SRC_URI_htckaiser = "git://git.linuxtogo.org/home/groups/mobile-linux/kernel.git;branch=htc-msm;protocol=git  file://defconfig"