diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-31 08:59:59 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-31 08:59:59 -0400 |
| commit | b1b934d31d8a608fe69fc56d6e539548b55b0601 (patch) | |
| tree | e8206589759c732a3a9b70b3feeb9ef50dc3c6b3 /arch/sparc64/defconfig | |
| parent | 5dd9feafb351a8bf304292623cbc63335c34d279 (diff) | |
| parent | b6ff50833ad43a8ebd9b16bf53c334f7aaf33c41 (diff) | |
Merge branch 'master'
Diffstat (limited to 'arch/sparc64/defconfig')
| -rw-r--r-- | arch/sparc64/defconfig | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/sparc64/defconfig b/arch/sparc64/defconfig index 38353621069e..43d9229fca07 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.18-rc1 | 3 | # Linux kernel version: 2.6.18-rc2 |
| 4 | # Wed Jul 12 14:00:58 2006 | 4 | # Fri Jul 21 14:19:24 2006 |
| 5 | # | 5 | # |
| 6 | CONFIG_SPARC=y | 6 | CONFIG_SPARC=y |
| 7 | CONFIG_SPARC64=y | 7 | CONFIG_SPARC64=y |
| @@ -36,6 +36,7 @@ CONFIG_SWAP=y | |||
| 36 | CONFIG_SYSVIPC=y | 36 | CONFIG_SYSVIPC=y |
| 37 | CONFIG_POSIX_MQUEUE=y | 37 | CONFIG_POSIX_MQUEUE=y |
| 38 | # CONFIG_BSD_PROCESS_ACCT is not set | 38 | # CONFIG_BSD_PROCESS_ACCT is not set |
| 39 | # CONFIG_TASKSTATS is not set | ||
| 39 | CONFIG_SYSCTL=y | 40 | CONFIG_SYSCTL=y |
| 40 | # CONFIG_AUDIT is not set | 41 | # CONFIG_AUDIT is not set |
| 41 | # CONFIG_IKCONFIG is not set | 42 | # CONFIG_IKCONFIG is not set |
| @@ -1120,7 +1121,7 @@ CONFIG_USB_HIDDEV=y | |||
| 1120 | # CONFIG_USB_LEGOTOWER is not set | 1121 | # CONFIG_USB_LEGOTOWER is not set |
| 1121 | # CONFIG_USB_LCD is not set | 1122 | # CONFIG_USB_LCD is not set |
| 1122 | # CONFIG_USB_LED is not set | 1123 | # CONFIG_USB_LED is not set |
| 1123 | # CONFIG_USB_CY7C63 is not set | 1124 | # CONFIG_USB_CYPRESS_CY7C63 is not set |
| 1124 | # CONFIG_USB_CYTHERM is not set | 1125 | # CONFIG_USB_CYTHERM is not set |
| 1125 | # CONFIG_USB_PHIDGETKIT is not set | 1126 | # CONFIG_USB_PHIDGETKIT is not set |
| 1126 | # CONFIG_USB_PHIDGETSERVO is not set | 1127 | # CONFIG_USB_PHIDGETSERVO is not set |
| @@ -1279,7 +1280,6 @@ CONFIG_RAMFS=y | |||
| 1279 | # CONFIG_NFSD is not set | 1280 | # CONFIG_NFSD is not set |
| 1280 | # CONFIG_SMB_FS is not set | 1281 | # CONFIG_SMB_FS is not set |
| 1281 | # CONFIG_CIFS is not set | 1282 | # CONFIG_CIFS is not set |
| 1282 | # CONFIG_CIFS_DEBUG2 is not set | ||
| 1283 | # CONFIG_NCP_FS is not set | 1283 | # CONFIG_NCP_FS is not set |
| 1284 | # CONFIG_CODA_FS is not set | 1284 | # CONFIG_CODA_FS is not set |
| 1285 | # CONFIG_AFS_FS is not set | 1285 | # CONFIG_AFS_FS is not set |