diff options
author | David S. Miller <davem@sunset.davemloft.net> | 2006-05-08 18:13:14 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-05-08 18:13:14 -0400 |
commit | 1f8aa2f66b7253d1a42ead0142c7a00d2df5ac89 (patch) | |
tree | d5e65e11301d33e91e207efa44454350f8ba32f0 | |
parent | 4cfbd7eb24975e942c3b6c0119c953c3a7a5f787 (diff) |
[SPARC64]: Update defconfig.
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | arch/sparc64/defconfig | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/arch/sparc64/defconfig b/arch/sparc64/defconfig index 1317380fa937..22ca69fc865c 100644 --- a/arch/sparc64/defconfig +++ b/arch/sparc64/defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.16 | 3 | # Linux kernel version: 2.6.17-rc3 |
4 | # Sun Apr 2 19:31:04 2006 | 4 | # Mon May 8 15:12:53 2006 |
5 | # | 5 | # |
6 | CONFIG_SPARC=y | 6 | CONFIG_SPARC=y |
7 | CONFIG_SPARC64=y | 7 | CONFIG_SPARC64=y |
@@ -114,6 +114,7 @@ CONFIG_GENERIC_CALIBRATE_DELAY=y | |||
114 | CONFIG_HUGETLB_PAGE_SIZE_4MB=y | 114 | CONFIG_HUGETLB_PAGE_SIZE_4MB=y |
115 | # CONFIG_HUGETLB_PAGE_SIZE_512K is not set | 115 | # CONFIG_HUGETLB_PAGE_SIZE_512K is not set |
116 | # CONFIG_HUGETLB_PAGE_SIZE_64K is not set | 116 | # CONFIG_HUGETLB_PAGE_SIZE_64K is not set |
117 | CONFIG_ARCH_SELECT_MEMORY_MODEL=y | ||
117 | CONFIG_ARCH_SPARSEMEM_ENABLE=y | 118 | CONFIG_ARCH_SPARSEMEM_ENABLE=y |
118 | CONFIG_ARCH_SPARSEMEM_DEFAULT=y | 119 | CONFIG_ARCH_SPARSEMEM_DEFAULT=y |
119 | CONFIG_LARGE_ALLOCS=y | 120 | CONFIG_LARGE_ALLOCS=y |
@@ -430,7 +431,6 @@ CONFIG_ISCSI_TCP=m | |||
430 | # CONFIG_SCSI_INIA100 is not set | 431 | # CONFIG_SCSI_INIA100 is not set |
431 | # CONFIG_SCSI_SYM53C8XX_2 is not set | 432 | # CONFIG_SCSI_SYM53C8XX_2 is not set |
432 | # CONFIG_SCSI_IPR is not set | 433 | # CONFIG_SCSI_IPR is not set |
433 | # CONFIG_SCSI_QLOGIC_FC is not set | ||
434 | # CONFIG_SCSI_QLOGIC_1280 is not set | 434 | # CONFIG_SCSI_QLOGIC_1280 is not set |
435 | # CONFIG_SCSI_QLOGICPTI is not set | 435 | # CONFIG_SCSI_QLOGICPTI is not set |
436 | # CONFIG_SCSI_QLA_FC is not set | 436 | # CONFIG_SCSI_QLA_FC is not set |
@@ -1042,9 +1042,7 @@ CONFIG_USB_HIDDEV=y | |||
1042 | # CONFIG_USB_ACECAD is not set | 1042 | # CONFIG_USB_ACECAD is not set |
1043 | # CONFIG_USB_KBTAB is not set | 1043 | # CONFIG_USB_KBTAB is not set |
1044 | # CONFIG_USB_POWERMATE is not set | 1044 | # CONFIG_USB_POWERMATE is not set |
1045 | # CONFIG_USB_MTOUCH is not set | 1045 | # CONFIG_USB_TOUCHSCREEN is not set |
1046 | # CONFIG_USB_ITMTOUCH is not set | ||
1047 | # CONFIG_USB_EGALAX is not set | ||
1048 | # CONFIG_USB_YEALINK is not set | 1046 | # CONFIG_USB_YEALINK is not set |
1049 | # CONFIG_USB_XPAD is not set | 1047 | # CONFIG_USB_XPAD is not set |
1050 | # CONFIG_USB_ATI_REMOTE is not set | 1048 | # CONFIG_USB_ATI_REMOTE is not set |
@@ -1115,6 +1113,14 @@ CONFIG_USB_HIDDEV=y | |||
1115 | # CONFIG_NEW_LEDS is not set | 1113 | # CONFIG_NEW_LEDS is not set |
1116 | 1114 | ||
1117 | # | 1115 | # |
1116 | # LED drivers | ||
1117 | # | ||
1118 | |||
1119 | # | ||
1120 | # LED Triggers | ||
1121 | # | ||
1122 | |||
1123 | # | ||
1118 | # InfiniBand support | 1124 | # InfiniBand support |
1119 | # | 1125 | # |
1120 | # CONFIG_INFINIBAND is not set | 1126 | # CONFIG_INFINIBAND is not set |