ARM: footbridge: remove leftover from personal-server

The machine was removed a while ago, and the checks are
now useless.

Reviewed-by: Christoph Hellwig <hch@lst.de>
Tested-by: Marc Zyngier <maz@kernel.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --git a/arch/arm/mach-footbridge/isa.c b/arch/arm/mach-footbridge/isa.c
index 3375ac2..84caccd 100644 (file)
--- a/arch/arm/mach-footbridge/isa.c
+++ b/arch/arm/mach-footbridge/isa.c
@@ -80,12 +80,11 @@ static int __init footbridge_isa_init(void)
        int err = 0;
 
        /* Personal server doesn't have RTC */
-       if (!machine_is_personal_server()) {
-               isa_rtc_init();
-               err = platform_device_register(&rtc_device);
-               if (err)
-                       printk(KERN_ERR "Unable to register RTC device: %d\n", err);
-       }
+       isa_rtc_init();
+       err = platform_device_register(&rtc_device);
+       if (err)
+               printk(KERN_ERR "Unable to register RTC device: %d\n", err);
+
        err = platform_device_register(&serial_device);
        if (err)
                printk(KERN_ERR "Unable to register serial device: %d\n", err);

diff --git a/drivers/tty/serial/21285.c b/drivers/tty/serial/21285.c
index 7520cc0..65d6af7 100644 (file)
--- a/drivers/tty/serial/21285.c
+++ b/drivers/tty/serial/21285.c
@@ -461,9 +461,6 @@ static int __init serial21285_console_setup(struct console *co, char *options)
        int parity = 'n';
        int flow = 'n';
 
-       if (machine_is_personal_server())
-               baud = 57600;
-
        /*
         * Check whether an invalid uart number has been specified, and
         * if so, search for the first available port that does have