diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-01 20:28:31 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-01 20:28:31 -0500 |
| commit | 132a69c6cc3dfa7fa354a88128acee7e6ee7082b (patch) | |
| tree | be77ed97c9c94cbcc9931c58ce1a061e9dc26755 /arch | |
| parent | fb7d4045669b3ea0e92cf45963839a9808b7650c (diff) | |
| parent | 74bd7d093b8e87f35eaf3b14459b96a0e20d1d10 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC64]: Fix parport_pc build.
[SPARC64]: Update defconfig.
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/sparc64/defconfig | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/sparc64/defconfig b/arch/sparc64/defconfig index 59eef403c60a..860b8b60526c 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.21-rc1 | 3 | # Linux kernel version: 2.6.21-rc2 |
| 4 | # Mon Feb 26 10:45:21 2007 | 4 | # Wed Feb 28 09:50:51 2007 |
| 5 | # | 5 | # |
| 6 | CONFIG_SPARC=y | 6 | CONFIG_SPARC=y |
| 7 | CONFIG_SPARC64=y | 7 | CONFIG_SPARC64=y |
| @@ -1219,6 +1219,7 @@ CONFIG_USB_HIDDEV=y | |||
| 1219 | # CONFIG_USB_SISUSBVGA is not set | 1219 | # CONFIG_USB_SISUSBVGA is not set |
| 1220 | # CONFIG_USB_LD is not set | 1220 | # CONFIG_USB_LD is not set |
| 1221 | # CONFIG_USB_TRANCEVIBRATOR is not set | 1221 | # CONFIG_USB_TRANCEVIBRATOR is not set |
| 1222 | # CONFIG_USB_IOWARRIOR is not set | ||
| 1222 | # CONFIG_USB_TEST is not set | 1223 | # CONFIG_USB_TEST is not set |
| 1223 | 1224 | ||
| 1224 | # | 1225 | # |