Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

1 files changed, 1 insertions, 3 deletions

diff --git a/drivers/serial/pmac_zilog.c b/drivers/serial/pmac_zilog.c
index 513ff8597707..459c0231aef3 100644
--- a/drivers/serial/pmac_zilog.c
+++ b/drivers/serial/pmac_zilog.c
@@ -42,7 +42,6 @@
 #undef DEBUG_HARD
 #undef USE_CTRL_O_SYSRQ
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/tty.h>
 
@@ -101,7 +100,6 @@ static DEFINE_MUTEX(pmz_irq_mutex);
 static struct uart_driver pmz_uart_reg = {
         .owner          =       THIS_MODULE,
         .driver_name    =       "ttyS",
-        .devfs_name     =       "tts/",
         .dev_name       =       "ttyS",
         .major          =       TTY_MAJOR,
 };
@@ -936,7 +934,7 @@ static int pmz_startup(struct uart_port *port)
         }       
 
         pmz_get_port_A(uap)->flags |= PMACZILOG_FLAG_IS_IRQ_ON;
-        if (request_irq(uap->port.irq, pmz_interrupt, SA_SHIRQ, "PowerMac Zilog", uap)) {
+        if (request_irq(uap->port.irq, pmz_interrupt, IRQF_SHARED, "PowerMac Zilog", uap)) {
                 dev_err(&uap->dev->ofdev.dev,
                         "Unable to register zs interrupt handler.\n");
                 pmz_set_scc_power(uap, 0);