diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-13 20:55:15 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-13 20:55:15 +0000 |
commit | 1471f525455788c20b130690e0f104df451aeb43 (patch) | |
tree | 3778beba56558beb9a9548ea5b467e9c44ea966f /arch/sparc64/defconfig | |
parent | e80d2c5456d30ebba5b0eb8a9d33e17d815d4d83 (diff) |
Merge with Linux 2.3.51.
Diffstat (limited to 'arch/sparc64/defconfig')
-rw-r--r-- | arch/sparc64/defconfig | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/sparc64/defconfig b/arch/sparc64/defconfig index 7e7a45a70..a61d4d049 100644 --- a/arch/sparc64/defconfig +++ b/arch/sparc64/defconfig @@ -97,6 +97,10 @@ CONFIG_BINFMT_ELF=y CONFIG_BINFMT_MISC=m # CONFIG_SUNOS_EMUL is not set CONFIG_SOLARIS_EMUL=m + +# +# Parallel port support +# CONFIG_PARPORT=m CONFIG_PARPORT_PC=m CONFIG_PARPORT_PC_FIFO=y @@ -176,7 +180,6 @@ CONFIG_ATALK=m CONFIG_DECNET=m CONFIG_DECNET_SIOCGIFCONF=y # CONFIG_DECNET_ROUTER is not set -CONFIG_DECNET_RAW=y # CONFIG_X25 is not set # CONFIG_LAPB is not set # CONFIG_BRIDGE is not set |