diff options
author | David S. Miller <davem@sunset.davemloft.net> | 2007-12-04 03:38:22 -0500 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-12-05 08:38:01 -0500 |
commit | 9cb1200a286799db897e81bc2b2c1730cfdc9c08 (patch) | |
tree | a94cdf145a123fc2b933ee6e2c19b6efe7065f08 /arch | |
parent | b127aa8bafb3b5b555ab0e7d6f87cb8a541a3d46 (diff) |
[SPARC64]: Update defconfig.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/sparc64/defconfig | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/sparc64/defconfig b/arch/sparc64/defconfig index 22734ac08c8a..f62d9f6c5e2a 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.24-rc1 | 3 | # Linux kernel version: 2.6.24-rc4 |
4 | # Wed Oct 31 15:36:47 2007 | 4 | # Tue Dec 4 00:37:59 2007 |
5 | # | 5 | # |
6 | CONFIG_SPARC=y | 6 | CONFIG_SPARC=y |
7 | CONFIG_SPARC64=y | 7 | CONFIG_SPARC64=y |
@@ -47,6 +47,7 @@ CONFIG_POSIX_MQUEUE=y | |||
47 | # CONFIG_BSD_PROCESS_ACCT is not set | 47 | # CONFIG_BSD_PROCESS_ACCT is not set |
48 | # CONFIG_TASKSTATS is not set | 48 | # CONFIG_TASKSTATS is not set |
49 | # CONFIG_USER_NS is not set | 49 | # CONFIG_USER_NS is not set |
50 | # CONFIG_PID_NS is not set | ||
50 | # CONFIG_AUDIT is not set | 51 | # CONFIG_AUDIT is not set |
51 | # CONFIG_IKCONFIG is not set | 52 | # CONFIG_IKCONFIG is not set |
52 | CONFIG_LOG_BUF_SHIFT=18 | 53 | CONFIG_LOG_BUF_SHIFT=18 |
@@ -154,6 +155,7 @@ CONFIG_PCI_DOMAINS=y | |||
154 | CONFIG_PCI_SYSCALL=y | 155 | CONFIG_PCI_SYSCALL=y |
155 | CONFIG_ARCH_SUPPORTS_MSI=y | 156 | CONFIG_ARCH_SUPPORTS_MSI=y |
156 | CONFIG_PCI_MSI=y | 157 | CONFIG_PCI_MSI=y |
158 | # CONFIG_PCI_LEGACY is not set | ||
157 | # CONFIG_PCI_DEBUG is not set | 159 | # CONFIG_PCI_DEBUG is not set |
158 | CONFIG_SUN_OPENPROMFS=m | 160 | CONFIG_SUN_OPENPROMFS=m |
159 | CONFIG_SPARC32_COMPAT=y | 161 | CONFIG_SPARC32_COMPAT=y |
@@ -359,7 +361,6 @@ CONFIG_IDE_GENERIC=y | |||
359 | CONFIG_BLK_DEV_IDEPCI=y | 361 | CONFIG_BLK_DEV_IDEPCI=y |
360 | # CONFIG_IDEPCI_SHARE_IRQ is not set | 362 | # CONFIG_IDEPCI_SHARE_IRQ is not set |
361 | CONFIG_IDEPCI_PCIBUS_ORDER=y | 363 | CONFIG_IDEPCI_PCIBUS_ORDER=y |
362 | # CONFIG_BLK_DEV_OFFBOARD is not set | ||
363 | # CONFIG_BLK_DEV_GENERIC is not set | 364 | # CONFIG_BLK_DEV_GENERIC is not set |
364 | # CONFIG_BLK_DEV_OPTI621 is not set | 365 | # CONFIG_BLK_DEV_OPTI621 is not set |
365 | CONFIG_BLK_DEV_IDEDMA_PCI=y | 366 | CONFIG_BLK_DEV_IDEDMA_PCI=y |
@@ -584,7 +585,6 @@ CONFIG_NIU=m | |||
584 | # CONFIG_USB_KAWETH is not set | 585 | # CONFIG_USB_KAWETH is not set |
585 | # CONFIG_USB_PEGASUS is not set | 586 | # CONFIG_USB_PEGASUS is not set |
586 | # CONFIG_USB_RTL8150 is not set | 587 | # CONFIG_USB_RTL8150 is not set |
587 | # CONFIG_USB_USBNET_MII is not set | ||
588 | # CONFIG_USB_USBNET is not set | 588 | # CONFIG_USB_USBNET is not set |
589 | # CONFIG_WAN is not set | 589 | # CONFIG_WAN is not set |
590 | # CONFIG_FDDI is not set | 590 | # CONFIG_FDDI is not set |
@@ -780,6 +780,7 @@ CONFIG_HWMON=y | |||
780 | # CONFIG_SENSORS_ADT7470 is not set | 780 | # CONFIG_SENSORS_ADT7470 is not set |
781 | # CONFIG_SENSORS_ATXP1 is not set | 781 | # CONFIG_SENSORS_ATXP1 is not set |
782 | # CONFIG_SENSORS_DS1621 is not set | 782 | # CONFIG_SENSORS_DS1621 is not set |
783 | # CONFIG_SENSORS_I5K_AMB is not set | ||
783 | # CONFIG_SENSORS_F71805F is not set | 784 | # CONFIG_SENSORS_F71805F is not set |
784 | # CONFIG_SENSORS_F71882FG is not set | 785 | # CONFIG_SENSORS_F71882FG is not set |
785 | # CONFIG_SENSORS_F75375S is not set | 786 | # CONFIG_SENSORS_F75375S is not set |