diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-07-25 15:46:44 -0700 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-07-25 15:46:44 -0700 |
| commit | 05cb784c81a0fd1f97732156ea464bd392ce875a (patch) | |
| tree | 24122979b411dcec6ff390fc9ae84ad9413128e9 /arch/arm/configs | |
| parent | 3190186362466658f01b2e354e639378ce07e1a9 (diff) | |
| parent | 6b6a93c6876ea1c530d5d3f68e3678093a27fab0 (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/bast_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/configs/s3c2410_defconfig | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/configs/bast_defconfig b/arch/arm/configs/bast_defconfig index 2d985e9611c..35e3a99bcbb 100644 --- a/arch/arm/configs/bast_defconfig +++ b/arch/arm/configs/bast_defconfig @@ -561,7 +561,6 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y # CONFIG_SERIAL_S3C2410=y CONFIG_SERIAL_S3C2410_CONSOLE=y -CONFIG_SERIAL_BAST_SIO=y CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y CONFIG_UNIX98_PTYS=y diff --git a/arch/arm/configs/s3c2410_defconfig b/arch/arm/configs/s3c2410_defconfig index 98b72ff3883..96a794d8de8 100644 --- a/arch/arm/configs/s3c2410_defconfig +++ b/arch/arm/configs/s3c2410_defconfig @@ -570,7 +570,6 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y # CONFIG_SERIAL_S3C2410=y CONFIG_SERIAL_S3C2410_CONSOLE=y -CONFIG_SERIAL_BAST_SIO=y CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y CONFIG_UNIX98_PTYS=y |