diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-07-06 22:04:31 -0600 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-07-06 22:04:31 -0600 |
| commit | 2967b22c6179ded9cc01496e10dcb0f292d0c182 (patch) | |
| tree | 9219e7dc564f3dc8af29ea142c4b5d409ea74310 /libre/linux-libre/config.i686 | |
| parent | 55677d14e4829d6a7859333d3560db346c228fdf (diff) | |
| parent | e84010fb9a6f81d96d9c54661a7abde97a0eb187 (diff) | |
Merge branch 'master-remote' into master-undelete
Diffstat (limited to 'libre/linux-libre/config.i686')
| -rw-r--r-- | libre/linux-libre/config.i686 | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686 index c91f26163..e84812997 100644 --- a/libre/linux-libre/config.i686 +++ b/libre/linux-libre/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.9.3-1 Kernel Configuration +# Linux/x86 3.9.7-1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -1581,8 +1581,8 @@ CONFIG_OF_MTD=y CONFIG_PARPORT=m CONFIG_PARPORT_PC=m CONFIG_PARPORT_SERIAL=m -CONFIG_PARPORT_PC_FIFO=y -CONFIG_PARPORT_PC_SUPERIO=y +# CONFIG_PARPORT_PC_FIFO is not set +# CONFIG_PARPORT_PC_SUPERIO is not set CONFIG_PARPORT_PC_PCMCIA=m # CONFIG_PARPORT_GSC is not set CONFIG_PARPORT_AX88796=m @@ -2434,7 +2434,7 @@ CONFIG_ATH9K=m CONFIG_ATH9K_PCI=y CONFIG_ATH9K_AHB=y # CONFIG_ATH9K_DEBUGFS is not set -CONFIG_ATH9K_RATE_CONTROL=y +# CONFIG_ATH9K_LEGACY_RATE_CONTROL is not set CONFIG_ATH9K_HTC=m # CONFIG_ATH9K_HTC_DEBUGFS is not set CONFIG_CARL9170=m @@ -4709,7 +4709,6 @@ CONFIG_USB_MUSB_TUSB6010=m CONFIG_MUSB_PIO_ONLY=y CONFIG_USB_CHIPIDEA=m CONFIG_USB_CHIPIDEA_UDC=y -CONFIG_USB_CHIPIDEA_HOST=y # CONFIG_USB_CHIPIDEA_DEBUG is not set CONFIG_USB_RENESAS_USBHS=m |