kernel-power v45 -> kernel-bfs

[kernel-bfs] / kernel-bfs-2.6.28 / debian / usbhost.diff

diff --git a/kernel-bfs-2.6.28/debian/usbhost.diff b/kernel-bfs-2.6.28/debian/usbhost.diff
index 210f95f..10729b7 100644 (file)
--- a/kernel-bfs-2.6.28/debian/usbhost.diff
+++ b/kernel-bfs-2.6.28/debian/usbhost.diff
@@ -1,6 +1,15 @@
---- rx51power_defconfig        2010-05-16 18:31:19.000000000 +0200
-+++ rx51power_defconfig.host   2010-05-16 14:57:57.000000000 +0200
-@@ -955,7 +955,24 @@
+--- rx51power_defconfig.old    2010-11-10 08:37:57.000000000 +0100
++++ rx51power_defconfig        2010-11-10 09:44:58.000000000 +0100
+@@ -1,7 +1,7 @@
+ #
+ # Automatically generated make config: don't edit
+ # Linux kernel version: 2.6.28.10power-omap1
+-# Tue Nov  9 20:27:06 2010
++# Wed Nov 10 09:44:58 2010
+ #
+ CONFIG_ARM=y
+ CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+@@ -957,7 +957,24 @@
  # CONFIG_USB_KAWETH is not set
  # CONFIG_USB_PEGASUS is not set
  # CONFIG_USB_RTL8150 is not set
@@ -26,7 +35,7 @@
  # CONFIG_WAN is not set
  CONFIG_PPP=m
  # CONFIG_PPP_MULTILINK is not set
-@@ -1610,8 +1627,8 @@
+@@ -1612,8 +1629,8 @@
  CONFIG_USB_ARCH_HAS_OHCI=y
  CONFIG_USB_ARCH_HAS_EHCI=y
  CONFIG_USB=y
@@ -37,49 +46,39 @@
  
  #
  # Miscellaneous USB options
-@@ -1620,8 +1637,8 @@
- # CONFIG_USB_DEVICE_CLASS is not set
+@@ -1623,7 +1640,7 @@
  CONFIG_USB_DYNAMIC_MINORS=y
  CONFIG_USB_SUSPEND=y
--CONFIG_USB_OTG=y
+ CONFIG_USB_OTG=y
 -CONFIG_USB_OTG_WHITELIST=y
-+# CONFIG_USB_OTG is not set
 +# CONFIG_USB_OTG_WHITELIST is not set
  # CONFIG_USB_OTG_BLACKLIST_HUB is not set
  CONFIG_USB_MON=y
  # CONFIG_USB_WUSB is not set
-@@ -1650,10 +1667,10 @@
- #
- # OMAP 343x high speed USB support
- #
--# CONFIG_USB_MUSB_HOST is not set
-+CONFIG_USB_MUSB_HOST=y
- # CONFIG_USB_MUSB_PERIPHERAL is not set
--CONFIG_USB_MUSB_OTG=y
--CONFIG_USB_GADGET_MUSB_HDRC=y
-+# CONFIG_USB_MUSB_OTG is not set
-+# CONFIG_USB_GADGET_MUSB_HDRC is not set
- CONFIG_USB_MUSB_HDRC_HCD=y
- # CONFIG_MUSB_PIO_ONLY is not set
- CONFIG_USB_INVENTRA_DMA=y
-@@ -1780,7 +1797,8 @@
- # CONFIG_USB_GADGET_ATMEL_USBA is not set
- # CONFIG_USB_GADGET_FSL_USB2 is not set
- # CONFIG_USB_GADGET_LH7A40X is not set
--# CONFIG_USB_GADGET_OMAP is not set
-+CONFIG_USB_GADGET_OMAP=y
-+CONFIG_USB_OMAP=m
- # CONFIG_USB_GADGET_PXA25X is not set
- # CONFIG_USB_GADGET_PXA27X is not set
- # CONFIG_USB_GADGET_S3C2410 is not set
-@@ -1790,9 +1808,8 @@
- # CONFIG_USB_GADGET_NET2280 is not set
- # CONFIG_USB_GADGET_GOKU is not set
+@@ -1786,7 +1803,7 @@
  # CONFIG_USB_GADGET_DUMMY_HCD is not set
--CONFIG_USB_GADGET_DUALSPEED=y
-+# CONFIG_USB_GADGET_DUALSPEED is not set
+ CONFIG_USB_GADGET_DUALSPEED=y
  CONFIG_USB_ZERO=m
 -# CONFIG_USB_ZERO_HNPTEST is not set
++CONFIG_USB_ZERO_HNPTEST=y
  CONFIG_USB_ETH=m
  CONFIG_USB_ETH_RNDIS=y
  # CONFIG_USB_GADGETFS is not set
+@@ -1794,7 +1811,7 @@
+ CONFIG_USB_FILE_STORAGE_TEST=y
+ CONFIG_USB_G_SERIAL=m
+ # CONFIG_USB_MIDI_GADGET is not set
+-# CONFIG_USB_G_PRINTER is not set
++CONFIG_USB_G_PRINTER=m
+ # CONFIG_USB_CDC_COMPOSITE is not set
+ CONFIG_USB_G_NOKIA=m
+ CONFIG_USB_G_SOFTUPD=m
+@@ -1808,7 +1825,7 @@
+ CONFIG_TWL4030_USB=y
+ CONFIG_USB_IP_COMMON=m
+ CONFIG_USB_IP_VHCI_HCD=m
+-# CONFIG_USB_IP_HOST is not set
++CONFIG_USB_IP_HOST=m
+ CONFIG_MMC=m
+ # CONFIG_MMC_DEBUG is not set
+ CONFIG_MMC_UNSAFE_RESUME=y