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-lts/config.i686 | |
parent | 55677d14e4829d6a7859333d3560db346c228fdf (diff) | |
parent | e84010fb9a6f81d96d9c54661a7abde97a0eb187 (diff) |
Merge branch 'master-remote' into master-undelete
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 |