diff options
author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2008-10-23 19:05:56 -0400 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2008-10-28 10:45:57 -0400 |
commit | 22e181ba7f09197dd6f35a48013cb86289644eb6 (patch) | |
tree | 89105a1c1f6ad755b62da38208972e8928fa8efe /arch/powerpc/configs/linkstation_defconfig | |
parent | 0173a3265b228da319ceb9c1ec6a5682fd1b2d92 (diff) |
powerpc: fix i2c on PPC linkstation / kurobox machines
The i2c bus defn is broken on linkstation / kurobox machines since at
least 2.6.27. Fix it. Also remove CONFIG_SERIAL_OF_PLATFORM, which, if
enabled, breaks the serial console after the
"console handover: boot [udbg0] -> real [ttyS1]" message.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/configs/linkstation_defconfig')
-rw-r--r-- | arch/powerpc/configs/linkstation_defconfig | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/powerpc/configs/linkstation_defconfig b/arch/powerpc/configs/linkstation_defconfig index 6fc4c2127757..d0846ec238d0 100644 --- a/arch/powerpc/configs/linkstation_defconfig +++ b/arch/powerpc/configs/linkstation_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.27-rc4 | 3 | # Linux kernel version: 2.6.27 |
4 | # Thu Aug 21 00:52:05 2008 | 4 | # Fri Oct 24 00:42:39 2008 |
5 | # | 5 | # |
6 | # CONFIG_PPC64 is not set | 6 | # CONFIG_PPC64 is not set |
7 | 7 | ||
@@ -934,7 +934,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 | |||
934 | CONFIG_SERIAL_CORE=y | 934 | CONFIG_SERIAL_CORE=y |
935 | CONFIG_SERIAL_CORE_CONSOLE=y | 935 | CONFIG_SERIAL_CORE_CONSOLE=y |
936 | # CONFIG_SERIAL_JSM is not set | 936 | # CONFIG_SERIAL_JSM is not set |
937 | CONFIG_SERIAL_OF_PLATFORM=y | 937 | # CONFIG_SERIAL_OF_PLATFORM is not set |
938 | CONFIG_UNIX98_PTYS=y | 938 | CONFIG_UNIX98_PTYS=y |
939 | CONFIG_LEGACY_PTYS=y | 939 | CONFIG_LEGACY_PTYS=y |
940 | CONFIG_LEGACY_PTY_COUNT=256 | 940 | CONFIG_LEGACY_PTY_COUNT=256 |
@@ -1211,7 +1211,6 @@ CONFIG_USB_STORAGE=m | |||
1211 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1211 | # CONFIG_USB_STORAGE_ALAUDA is not set |
1212 | # CONFIG_USB_STORAGE_ONETOUCH is not set | 1212 | # CONFIG_USB_STORAGE_ONETOUCH is not set |
1213 | # CONFIG_USB_STORAGE_KARMA is not set | 1213 | # CONFIG_USB_STORAGE_KARMA is not set |
1214 | # CONFIG_USB_STORAGE_SIERRA is not set | ||
1215 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | 1214 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set |
1216 | # CONFIG_USB_LIBUSUAL is not set | 1215 | # CONFIG_USB_LIBUSUAL is not set |
1217 | 1216 | ||