[oe-commits] Koen Kooi : linux-omap-psp 2.6.32: disable CDC_EEM for beagleboard

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: a024da1d8ea3cb5d7dcc6d5a0da9d47b8a80cfa8
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=a024da1d8ea3cb5d7dcc6d5a0da9d47b8a80cfa8

Author: Koen Kooi <koen at openembedded.org>
Date:   Sun Jun  6 14:11:42 2010 +0200

linux-omap-psp 2.6.32: disable CDC_EEM for beagleboard

---

 conf/machine/include/omap3.inc                     |    2 +-
 .../linux-omap-psp-2.6.32/beagleboard/defconfig    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc
index bb7f0de..4b3689d 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 679d917..0841f48 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