summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2010-06-06 14:11:42 +0200
committerKoen Kooi <koen@openembedded.org>2010-06-06 14:11:42 +0200
commita024da1d8ea3cb5d7dcc6d5a0da9d47b8a80cfa8 (patch)
tree7615883abff2ff3202ab79861efbbb0be246dc5e
parentd85332a8ca6894c3a2d1b77ea8b91ce59c8dc592 (diff)
linux-omap-psp 2.6.32: disable CDC_EEM for beagleboard
-rw-r--r--conf/machine/include/omap3.inc2
-rw-r--r--recipes/linux/linux-omap-psp-2.6.32/beagleboard/defconfig2
2 files changed, 2 insertions, 2 deletions
diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc
index bb7f0de7b5..4b3689daa1 100644
--- a/conf/machine/include/omap3.inc
+++ b/conf/machine/include/omap3.inc
@@ -3,7 +3,7 @@ SOC_FAMILY = "omap3"
require conf/machine/include/tune-cortexa8.inc
PREFERRED_PROVIDER_virtual/kernel = "linux-omap"
# Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r76"
+MACHINE_KERNEL_PR = "r77"
KERNEL_IMAGETYPE = "uImage"
diff --git a/recipes/linux/linux-omap-psp-2.6.32/beagleboard/defconfig b/recipes/linux/linux-omap-psp-2.6.32/beagleboard/defconfig
index 679d917e16..0841f486d0 100644
--- a/recipes/linux/linux-omap-psp-2.6.32/beagleboard/defconfig
+++ b/recipes/linux/linux-omap-psp-2.6.32/beagleboard/defconfig
@@ -1250,7 +1250,7 @@ CONFIG_USB_RTL8150=y
CONFIG_USB_USBNET=y
CONFIG_USB_NET_AX8817X=y
CONFIG_USB_NET_CDCETHER=y
-CONFIG_USB_NET_CDC_EEM=y
+CONFIG_USB_NET_CDC_EEM=n
CONFIG_USB_NET_DM9601=y
CONFIG_USB_NET_SMSC95XX=y
CONFIG_USB_NET_GL620A=y