diff options
| author | Nicolás Reynolds <fauno@parabola.nu> | 2013-07-03 10:33:32 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@parabola.nu> | 2013-07-03 10:33:32 -0300 |
| commit | 8647aee53c2f9f5458e57fe7ac212da40a555594 (patch) | |
| tree | b99a8fbc859d18a244ea5ac496083e66ffaa330d /libre/linux-libre/config.x86_64 | |
| parent | 3a14409a347f3423bf2a4ab847edff625b671e20 (diff) | |
| parent | 0a5c7083d197551290bc762f4ba90210cb733a5e (diff) | |
| download | abslibre-8647aee53c2f9f5458e57fe7ac212da40a555594.tar.gz abslibre-8647aee53c2f9f5458e57fe7ac212da40a555594.tar.bz2 abslibre-8647aee53c2f9f5458e57fe7ac212da40a555594.zip | |
Merge branch 'master' of vparabola:abslibre
Conflicts:
java/not-working/java-bnd/PKGBUILD
libre/parabola-keyring/PKGBUILD
Diffstat (limited to 'libre/linux-libre/config.x86_64')
| -rw-r--r-- | libre/linux-libre/config.x86_64 | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64 index f4c0f5937..0937bed6f 100644 --- a/libre/linux-libre/config.x86_64 +++ b/libre/linux-libre/config.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.9.4-1 Kernel Configuration +# Linux/x86 3.9.7-1 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -1530,8 +1530,8 @@ CONFIG_MTD_UBI_BEB_LIMIT=20 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 @@ -2345,7 +2345,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 @@ -4526,7 +4526,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 |