diff options
author | Randy Dunlap <rdunlap@xenotime.net> | 2012-03-23 19:22:50 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2012-03-24 03:18:03 -0400 |
commit | f5243d6de7ae232e1d81e44ae9756bbd8c988fcd (patch) | |
tree | 6d2399ca3878e8cddfdf2978a68dd09ab8e222cd /arch/x86/configs | |
parent | 65c0ff4079c011232e795e62c74a0a95512b7ac3 (diff) |
x86/kconfig: Remove CONFIG_TR=y from the defconfigs
Remove CONFIG_TR=y from the x86 defconfigs since
token ring support is antiquated and obsolete.
( I reviewed both x86 defconfigs - I didn't come up with
anything else that obviously should be removed. )
Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Link: http://lkml.kernel.org/r/4F6D05CA.2050801@xenotime.net
[ Twiddled the changelog a bit ]
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/configs')
-rw-r--r-- | arch/x86/configs/i386_defconfig | 1 | ||||
-rw-r--r-- | arch/x86/configs/x86_64_defconfig | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/configs/i386_defconfig b/arch/x86/configs/i386_defconfig index 2d562821a88f..119db67dcb03 100644 --- a/arch/x86/configs/i386_defconfig +++ b/arch/x86/configs/i386_defconfig | |||
@@ -183,7 +183,6 @@ CONFIG_8139TOO=y | |||
183 | # CONFIG_8139TOO_PIO is not set | 183 | # CONFIG_8139TOO_PIO is not set |
184 | CONFIG_R8169=y | 184 | CONFIG_R8169=y |
185 | CONFIG_FDDI=y | 185 | CONFIG_FDDI=y |
186 | CONFIG_TR=y | ||
187 | CONFIG_INPUT_POLLDEV=y | 186 | CONFIG_INPUT_POLLDEV=y |
188 | # CONFIG_INPUT_MOUSEDEV_PSAUX is not set | 187 | # CONFIG_INPUT_MOUSEDEV_PSAUX is not set |
189 | CONFIG_INPUT_EVDEV=y | 188 | CONFIG_INPUT_EVDEV=y |
diff --git a/arch/x86/configs/x86_64_defconfig b/arch/x86/configs/x86_64_defconfig index 3cf137ad2789..76eb2903809f 100644 --- a/arch/x86/configs/x86_64_defconfig +++ b/arch/x86/configs/x86_64_defconfig | |||
@@ -176,7 +176,6 @@ CONFIG_SKY2=y | |||
176 | CONFIG_FORCEDETH=y | 176 | CONFIG_FORCEDETH=y |
177 | CONFIG_8139TOO=y | 177 | CONFIG_8139TOO=y |
178 | CONFIG_FDDI=y | 178 | CONFIG_FDDI=y |
179 | CONFIG_TR=y | ||
180 | CONFIG_INPUT_POLLDEV=y | 179 | CONFIG_INPUT_POLLDEV=y |
181 | # CONFIG_INPUT_MOUSEDEV_PSAUX is not set | 180 | # CONFIG_INPUT_MOUSEDEV_PSAUX is not set |
182 | CONFIG_INPUT_EVDEV=y | 181 | CONFIG_INPUT_EVDEV=y |