2 files changed, 11 insertions, 9 deletions

diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index 775361f67bfd..dabc93649495 100644
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -124,6 +124,7 @@ choice
 
 config ALPHA_GENERIC
         bool "Generic"
+        depends on TTY
         help
           A generic kernel will run on all supported Alpha hardware.
 
@@ -490,6 +491,7 @@ config VGA_HOSE
 
 config ALPHA_SRM
         bool "Use SRM as bootloader" if ALPHA_CABRIOLET || ALPHA_AVANTI_CH || ALPHA_EB64P || ALPHA_PC164 || ALPHA_TAKARA || ALPHA_EB164 || ALPHA_ALCOR || ALPHA_MIATA || ALPHA_LX164 || ALPHA_SX164 || ALPHA_NAUTILUS || ALPHA_NONAME
+        depends on TTY
         default y if ALPHA_JENSEN || ALPHA_MIKASA || ALPHA_SABLE || ALPHA_LYNX || ALPHA_NORITAKE || ALPHA_DP264 || ALPHA_RAWHIDE || ALPHA_EIGER || ALPHA_WILDFIRE || ALPHA_TITAN || ALPHA_SHARK || ALPHA_MARVEL
         ---help---
           There are two different types of booting firmware on Alphas: SRM,
diff --git a/arch/alpha/kernel/srmcons.c b/arch/alpha/kernel/srmcons.c
index 59b7bbad8394..6f01d9ad7b81 100644
--- a/arch/alpha/kernel/srmcons.c
+++ b/arch/alpha/kernel/srmcons.c
@@ -44,7 +44,7 @@ typedef union _srmcons_result {
 
 /* called with callback_lock held */
 static int
-srmcons_do_receive_chars(struct tty_struct *tty)
+srmcons_do_receive_chars(struct tty_port *port)
 {
         srmcons_result result;
         int count = 0, loops = 0;
@@ -52,13 +52,13 @@ srmcons_do_receive_chars(struct tty_struct *tty)
         do {
                 result.as_long = callback_getc(0);
                 if (result.bits.status < 2) {
-                        tty_insert_flip_char(tty, (char)result.bits.c, 0);
+                        tty_insert_flip_char(port, (char)result.bits.c, 0);
                         count++;
                 }
         } while((result.bits.status & 1) && (++loops < 10));
 
         if (count)
-                tty_schedule_flip(tty);
+                tty_schedule_flip(port);
 
         return count;
 }
@@ -73,7 +73,7 @@ srmcons_receive_chars(unsigned long data)
 
         local_irq_save(flags);
         if (spin_trylock(&srmcons_callback_lock)) {
-                if (!srmcons_do_receive_chars(port->tty))
+                if (!srmcons_do_receive_chars(port))
                         incr = 100;
                 spin_unlock(&srmcons_callback_lock);
         } 
@@ -88,7 +88,7 @@ srmcons_receive_chars(unsigned long data)
 
 /* called with callback_lock held */
 static int
-srmcons_do_write(struct tty_struct *tty, const char *buf, int count)
+srmcons_do_write(struct tty_port *port, const char *buf, int count)
 {
         static char str_cr[1] = "\r";
         long c, remaining = count;
@@ -113,10 +113,10 @@ srmcons_do_write(struct tty_struct *tty, const char *buf, int count)
                         cur += result.bits.c;
 
                         /*
-                         * Check for pending input iff a tty was provided
+                         * Check for pending input iff a tty port was provided
                          */
-                        if (tty)
-                                srmcons_do_receive_chars(tty);
+                        if (port)
+                                srmcons_do_receive_chars(port);
                 }
 
                 while (need_cr) {
@@ -135,7 +135,7 @@ srmcons_write(struct tty_struct *tty,
         unsigned long flags;
 
         spin_lock_irqsave(&srmcons_callback_lock, flags);
-        srmcons_do_write(tty, (const char *) buf, count);
+        srmcons_do_write(tty->port, (const char *) buf, count);
         spin_unlock_irqrestore(&srmcons_callback_lock, flags);
 
         return count;