[SERIAL] Fix Sparc32/64 handling of CONFIG_SERIAL_CORE{,_CONSOLE}

SPARC was unconditionally setting CONFIG_SERIAL_CORE_CONSOLE to y
and conditionally setting CONFIG_SERIAL_CORE depending on the Sparc
sub-drivers.  In addition, the core serial driver for SPARC is
always built, so we end up with link errors.

We instead make CONFIG_SERIAL_CORE{,_CONSOLE} dependent on building
the SPARC core driver (CONFIG_SERIAL_SUNCORE).

diff --git a/drivers/serial/Config.in b/drivers/serial/Config.in
index fdf3f23d1cd63a14a0105e6e03693ded3f0d2683..5a7841d7deeb3d1da9198ccff1a431f02a8858b2 100644 (file)
--- a/drivers/serial/Config.in
+++ b/drivers/serial/Config.in
@@ -53,7 +53,6 @@ fi
 
 if [ "$CONFIG_SPARC32" = "y" -o "$CONFIG_SPARC64" = "y" ]; then
    define_bool CONFIG_SERIAL_SUNCORE y
-   define_bool CONFIG_SERIAL_CORE_CONSOLE y
    tristate 'Sun Zilog8530 serial support' CONFIG_SERIAL_SUNZILOG
    dep_tristate 'Sun SU serial support' CONFIG_SERIAL_SUNSU $CONFIG_PCI
    dep_tristate 'Sun Siemens SAB82532 serial support' CONFIG_SERIAL_SUNSAB $CONFIG_PCI
@@ -63,16 +62,14 @@ if [ "$CONFIG_SERIAL_AMBA" = "y"   -o "$CONFIG_SERIAL_CLPS711X" = "y" -o \
      "$CONFIG_SERIAL_21285" = "y"  -o "$CONFIG_SERIAL_SA1100" = "y" -o \
      "$CONFIG_SERIAL_ANAKIN" = "y" -o "$CONFIG_SERIAL_UART00" = "y" -o \
      "$CONFIG_SERIAL_8250" = "y"   -o "$CONFIG_SERIAL_ROCKETPORT" = "y" -o \
-     "$CONFIG_SERIAL_SUNZILOG" = "y" -o "$CONFIG_SERIAL_SUNSU" = "y" -o \
-     "$CONFIG_SERIAL_SUNSAB" = "y" ]; then
+     "$CONFIG_SERIAL_SUNCORE" = "y" ]; then
    define_bool CONFIG_SERIAL_CORE y
 else
    if [ "$CONFIG_SERIAL_AMBA" = "m"   -o "$CONFIG_SERIAL_CLPS711X" = "m" -o \
         "$CONFIG_SERIAL_21285" = "m"  -o "$CONFIG_SERIAL_SA1100" = "m" -o \
         "$CONFIG_SERIAL_ANAKIN" = "m" -o "$CONFIG_SERIAL_UART00" = "m" -o \
         "$CONFIG_SERIAL_8250" = "m"   -o "$CONFIG_SERIAL_ROCKETPORT" = "m" -o \
-        "$CONFIG_SERIAL_SUNZILOG" = "m" -o "$CONFIG_SERIAL_SUNSU" = "m" -o \
-        "$CONFIG_SERIAL_SUNSAB" = "m" ]; then
+        "$CONFIG_SERIAL_SUNCORE" = "m" ]; then
       define_bool CONFIG_SERIAL_CORE m
    fi
 fi