diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-07-04 19:48:31 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-07-04 19:48:31 +0200 |
| commit | ee9c1a601c6ce156c295e4a4608ad50535192954 (patch) | |
| tree | 49757b312b758e793ffd8bfedd2d6665cd0b3e29 /libre/linux-libre-lts/config.i686 | |
| parent | 2690b2e42de85dbcbca602f3299ae4404918e94d (diff) | |
| parent | e9eb2503b10fe4c4aefbee39226c8962d72d58bd (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/bitcoin/PKGBUILD
community/calc/PKGBUILD
community/fcitx/PKGBUILD
community/gloobus-preview/PKGBUILD
community/linux-tools/PKGBUILD
community/smc/PKGBUILD
extra/elfutils/PKGBUILD
extra/freenx/PKGBUILD
extra/gnome-alsamixer/PKGBUILD
extra/gvfs/PKGBUILD
extra/kdenetwork/PKGBUILD
extra/kdepim/PKGBUILD
extra/kdesdk-kate/PKGBUILD
extra/lcms2/PKGBUILD
extra/libmspack/PKGBUILD
extra/libtheora/PKGBUILD
extra/mesa/PKGBUILD
extra/nx-common/PKGBUILD
extra/opennx/PKGBUILD
extra/perl-tk/PKGBUILD
extra/qt4/PKGBUILD
extra/soprano/PKGBUILD
extra/wireshark/PKGBUILD
extra/xmlsec/PKGBUILD
extra/xorg-server/PKGBUILD
libre/audacious-plugins-libre/PKGBUILD
libre/ipsec-tools-libre/PKGBUILD
libre/tomoyo-tools-libre/PKGBUILD
pcr/amsynth/PKGBUILD
Diffstat (limited to 'libre/linux-libre-lts/config.i686')
| -rw-r--r-- | libre/linux-libre-lts/config.i686 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libre/linux-libre-lts/config.i686 b/libre/linux-libre-lts/config.i686 index 849fd016b..a1d065a1a 100644 --- a/libre/linux-libre-lts/config.i686 +++ b/libre/linux-libre-lts/config.i686 @@ -1438,8 +1438,8 @@ CONFIG_OF_PCI=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 |