diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-23 20:01:26 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-23 20:01:26 -0400 |
| commit | 2c2a68b84752cb1090fd2456e8b83e5bcc0e73c4 (patch) | |
| tree | fddb2afa9f3f1c49823ee7cfa7bcc9767e888e79 /arch/arm/configs/s3c2410_defconfig | |
| parent | c94c0d201f1c1a62184f4f220c1615347aafbee7 (diff) | |
| parent | 056a8763fc036639441a6dc49b61e57bc632af6e (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-serial
Diffstat (limited to 'arch/arm/configs/s3c2410_defconfig')
| -rw-r--r-- | arch/arm/configs/s3c2410_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/configs/s3c2410_defconfig b/arch/arm/configs/s3c2410_defconfig index 98b72ff38832..96a794d8de84 100644 --- a/arch/arm/configs/s3c2410_defconfig +++ b/arch/arm/configs/s3c2410_defconfig | |||
| @@ -570,7 +570,6 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y | |||
| 570 | # | 570 | # |
| 571 | CONFIG_SERIAL_S3C2410=y | 571 | CONFIG_SERIAL_S3C2410=y |
| 572 | CONFIG_SERIAL_S3C2410_CONSOLE=y | 572 | CONFIG_SERIAL_S3C2410_CONSOLE=y |
| 573 | CONFIG_SERIAL_BAST_SIO=y | ||
| 574 | CONFIG_SERIAL_CORE=y | 573 | CONFIG_SERIAL_CORE=y |
| 575 | CONFIG_SERIAL_CORE_CONSOLE=y | 574 | CONFIG_SERIAL_CORE_CONSOLE=y |
| 576 | CONFIG_UNIX98_PTYS=y | 575 | CONFIG_UNIX98_PTYS=y |