diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-09-12 01:29:55 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1997-09-12 01:29:55 +0000 |
| commit | 545f435ebcfd94a1e7c20b46efe81b4d6ac4e698 (patch) | |
| tree | e9ce4bc598d06374bda906f18365984bf22a526a /arch/sparc64/defconfig | |
| parent | 4291a610eef89d0d5c69d9a10ee6560e1aa36c74 (diff) | |
Merge with Linux 2.1.55. More bugfixes and goodies from my private
CVS archive.
Diffstat (limited to 'arch/sparc64/defconfig')
| -rw-r--r-- | arch/sparc64/defconfig | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/arch/sparc64/defconfig b/arch/sparc64/defconfig index c9c92b987..85958cd6e 100644 --- a/arch/sparc64/defconfig +++ b/arch/sparc64/defconfig @@ -29,6 +29,7 @@ CONFIG_SUN_KEYBOARD=y CONFIG_SUN_CONSOLE=y CONFIG_SUN_AUXIO=y CONFIG_SUN_IO=y +CONFIG_PCI=y # # SBUS Frame Buffer support @@ -49,6 +50,7 @@ SUN_FB_CREATOR=y # CONFIG_SUN_OPENPROMIO=m CONFIG_SUN_MOSTEK_RTC=y +# CONFIG_SAB82532 is not set # CONFIG_SUN_BPP is not set # CONFIG_SUN_VIDEOPIX is not set CONFIG_SUN_OPENPROMFS=m @@ -61,17 +63,26 @@ CONFIG_BINFMT_ELF32=y CONFIG_BINFMT_AOUT32=y CONFIG_BINFMT_JAVA=m CONFIG_BINFMT_MISC=m +CONFIG_SOLARIS_EMUL=m # # Floppy, IDE, and other block devices # -# CONFIG_BLK_DEV_FD is not set +CONFIG_BLK_DEV_FD=y CONFIG_BLK_DEV_MD=y CONFIG_MD_LINEAR=m CONFIG_MD_STRIPED=m CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_INITRD=y CONFIG_BLK_DEV_LOOP=m +CONFIG_BLK_DEV_IDE=y +CONFIG_BLK_DEV_IDEDISK=y +CONFIG_BLK_DEV_IDECD=y +CONFIG_BLK_DEV_IDETAPE=m +CONFIG_BLK_DEV_IDEFLOPPY=m +# CONFIG_BLK_DEV_IDESCSI is not set +CONFIG_IDE_CHIPSETS=y +CONFIG_BLK_DEV_NS87415=y # # Networking options @@ -85,12 +96,13 @@ CONFIG_INET=y # CONFIG_IP_ROUTER is not set # CONFIG_NET_IPIP is not set # CONFIG_SYN_COOKIES is not set +# CONFIG_XTP is not set # # (it is safe to leave these untouched) # # CONFIG_INET_PCTCP is not set -# CONFIG_INET_RARP is not set +CONFIG_INET_RARP=m CONFIG_PATH_MTU_DISCOVERY=y CONFIG_IP_NOSR=y CONFIG_SKB_LARGE=y @@ -136,6 +148,12 @@ CONFIG_SCSI_CONSTANTS=y # CONFIG_SCSI_SUNESP=y CONFIG_SCSI_QLOGICPTI=m +CONFIG_SCSI_AIC7XXX=y +# CONFIG_AIC7XXX_TAGGED_QUEUEING is not set +# CONFIG_OVERRIDE_CMDS is not set +# CONFIG_AIC7XXX_PAGE_ENABLE is not set +# CONFIG_AIC7XXX_PROC_STATS is not set +CONFIG_AIC7XXX_RESET_DELAY=5 # # Network device support @@ -155,6 +173,7 @@ CONFIG_SUNLANCE=y CONFIG_HAPPYMEAL=y CONFIG_SUNQE=m CONFIG_MYRI_SBUS=m +CONFIG_DE4X5=y # # Filesystems @@ -187,6 +206,7 @@ CONFIG_AMIGA_PARTITION=y CONFIG_UFS_FS=m CONFIG_BSD_DISKLABEL=y CONFIG_SMD_DISKLABEL=y +# CONFIG_MAC_PARTITION is not set # # Kernel hacking |