summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Jones <davej@redhat.com>2011-08-02 18:20:02 -0400
committerDave Jones <davej@redhat.com>2011-08-02 18:20:02 -0400
commitf52a0de1ada8189a741b2770ddde63cf00d333b7 (patch)
tree15ea3e9b9e5220b515cddf813f27965f8725ca08
parented3d2678ba5898821f726bc771672afa26e6c7ba (diff)
downloadkernel-f52a0de1ada8189a741b2770ddde63cf00d333b7.tar.gz
kernel-f52a0de1ada8189a741b2770ddde63cf00d333b7.tar.xz
kernel-f52a0de1ada8189a741b2770ddde63cf00d333b7.zip
Change USB_SERIAL_OPTION back to modular. (rhbz 727680)
-rw-r--r--config-generic2
-rw-r--r--kernel.spec3
2 files changed, 4 insertions, 1 deletions
diff --git a/config-generic b/config-generic
index 250a81ff7..60562afc9 100644
--- a/config-generic
+++ b/config-generic
@@ -3420,7 +3420,7 @@ CONFIG_USB_SERIAL_MOS7715_PARPORT=y
CONFIG_USB_SERIAL_MOS7840=m
CONFIG_USB_SERIAL_MOTOROLA=m
CONFIG_USB_SERIAL_NAVMAN=m
-CONFIG_USB_SERIAL_OPTION=y
+CONFIG_USB_SERIAL_OPTION=m
CONFIG_USB_SERIAL_OTI6858=m
CONFIG_USB_SERIAL_OPTICON=m
CONFIG_USB_SERIAL_OMNINET=m
diff --git a/kernel.spec b/kernel.spec
index 66bd1080f..a1e70f246 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1891,6 +1891,9 @@ fi
# ||----w |
# || ||
%changelog
+* Tue Aug 02 2011 Dave Jones <davej@redhat.com>
+- Change USB_SERIAL_OPTION back to modular. (rhbz 727680)
+
* Tue Aug 02 2011 Josh Boyer <jwboyer@redhat.com>
- Linux 3.0-git17
- Add patch to fix backtrace in cdc_ncm driver (rhbz 720128)