Browse files

Merge branch 'master' of github.com:buglabs/bug20-2.6.31-omap

  • Loading branch information...
2 parents 2a983aa + 3797426 commit 144ce996e03ba6b8c62ad358e8015fdb8de5df01 David Findlay committed Jan 4, 2011
Showing with 1,357 additions and 1,296 deletions.
  1. +2 −2 arch/arm/configs/omap3_bug_defconfig
  2. +1,355 −1,294 drivers/usb/serial/option.c
View
4 arch/arm/configs/omap3_bug_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.31-omap1
-# Fri Oct 29 19:43:03 2010
+# Thu Dec 30 14:30:58 2010
#
CONFIG_ARM=y
CONFIG_HAVE_PWM=y
@@ -1650,7 +1650,7 @@ CONFIG_USB_SERIAL_SIERRAWIRELESS=m
# CONFIG_USB_SERIAL_TI is not set
# CONFIG_USB_SERIAL_CYBERJACK is not set
# CONFIG_USB_SERIAL_XIRCOM is not set
-# CONFIG_USB_SERIAL_OPTION is not set
+CONFIG_USB_SERIAL_OPTION=m
# CONFIG_USB_SERIAL_OMNINET is not set
# CONFIG_USB_SERIAL_OPTICON is not set
CONFIG_USB_SERIAL_DEBUG=m
View
2,649 drivers/usb/serial/option.c
1,355 additions, 1,294 deletions not shown because the diff is too large. Please use a local Git client to view these changes.

0 comments on commit 144ce99

Please sign in to comment.