diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-07-09 21:04:53 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-07-09 21:04:53 -0300 |
| commit | fd5ff7e53a5b8dbabc85ab6e2ff1342b85e155b1 (patch) | |
| tree | d2b16d75c64d947545149f37bda7cdb8873a4770 /kernels/linux-libre-xen/config | |
| parent | 7823c9009a845174746fd0da09af46a138481851 (diff) | |
| parent | 10aa61ef39e662453e1d817046e359372fe3b326 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/aspell-pl/PKGBUILD
community/gloox/PKGBUILD
community/libircclient/PKGBUILD
community/mashup/PKGBUILD
community/omniorb/PKGBUILD
community/openbox/PKGBUILD
community/patchutils/PKGBUILD
community/rxvt-unicode/PKGBUILD
extra/mesa/PKGBUILD
extra/pygobject2/PKGBUILD
extra/qt5/PKGBUILD
extra/samba/PKGBUILD
extra/tdb/PKGBUILD
extra/transmission/PKGBUILD
extra/vim/PKGBUILD
pcr/python-sfml2/PKGBUILD
pcr/python2-sfml2/PKGBUILD
Diffstat (limited to 'kernels/linux-libre-xen/config')
| -rw-r--r-- | kernels/linux-libre-xen/config | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/kernels/linux-libre-xen/config b/kernels/linux-libre-xen/config index c4c81ff93..37b2b4a47 100644 --- a/kernels/linux-libre-xen/config +++ b/kernels/linux-libre-xen/config @@ -1592,8 +1592,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 @@ -4738,7 +4738,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 |