prepare v38, usbhost

[kernel-power] / kernel-power-2.6.28 / debian / usb.diff

diff --git a/kernel-power-2.6.28/debian/usb.diff b/kernel-power-2.6.28/debian/usb.diff
index 0bef41a..146be4c 100644 (file)
--- a/kernel-power-2.6.28/debian/usb.diff
+++ b/kernel-power-2.6.28/debian/usb.diff
@@ -1,6 +1,8 @@
---- rx51power_defconfig.28     2010-05-16 13:59:55.000000000 +0200
-+++ rx51power_defconfig        2010-05-16 14:00:00.000000000 +0200
-@@ -953,7 +953,24 @@
+diff --git a/kernel-power-2.6.28/debian/rx51power_defconfig b/kernel-power-2.6.28/debian/rx51power_defconfig
+index b9d4a91..d86c418 100644
+--- a/kernel-power-2.6.28/debian/rx51power_defconfig
++++ b/kernel-power-2.6.28/debian/rx51power_defconfig
+@@ -953,7 +952,24 @@ CONFIG_WL1251=m
  # CONFIG_USB_KAWETH is not set
  # CONFIG_USB_PEGASUS is not set
  # CONFIG_USB_RTL8150 is not set
@@ -26,18 +28,16 @@
  # CONFIG_WAN is not set
  CONFIG_PPP=m
  # CONFIG_PPP_MULTILINK is not set
-@@ -1608,8 +1625,8 @@
- CONFIG_USB_ARCH_HAS_OHCI=y
+@@ -1609,7 +1625,7 @@ CONFIG_USB_ARCH_HAS_OHCI=y
  CONFIG_USB_ARCH_HAS_EHCI=y
  CONFIG_USB=y
--# CONFIG_USB_DEBUG is not set
+ # CONFIG_USB_DEBUG is not set
 -# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
-+CONFIG_USB_DEBUG=y
 +CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
  
  #
  # Miscellaneous USB options
-@@ -1619,7 +1636,7 @@
+@@ -1619,7 +1635,7 @@ CONFIG_USB_DEVICEFS=y
  CONFIG_USB_DYNAMIC_MINORS=y
  CONFIG_USB_SUSPEND=y
  CONFIG_USB_OTG=y
@@ -46,16 +46,7 @@
  # CONFIG_USB_OTG_BLACKLIST_HUB is not set
  CONFIG_USB_MON=y
  # CONFIG_USB_WUSB is not set
-@@ -1769,7 +1786,7 @@
- # CONFIG_USB_ISIGHTFW is not set
- # CONFIG_USB_VST is not set
- CONFIG_USB_GADGET=m
--# CONFIG_USB_GADGET_DEBUG is not set
-+CONFIG_USB_GADGET_DEBUG=y
- # CONFIG_USB_GADGET_DEBUG_FILES is not set
- # CONFIG_USB_GADGET_DEBUG_FS is not set
- CONFIG_USB_GADGET_VBUS_DRAW=2
-@@ -1807,7 +1824,7 @@
+@@ -1799,7 +1815,7 @@ CONFIG_USB_G_SOFTUPD=m
  # OTG and related infrastructure
  #
  CONFIG_USB_OTG_UTILS=y