1 files changed, 1 insertions, 6 deletions

diff --git a/drivers/serial/dz.c b/drivers/serial/dz.c
index bf71bad5c34f..d119c8296a78 100644
--- a/drivers/serial/dz.c
+++ b/drivers/serial/dz.c
@@ -26,7 +26,6 @@
 
 #undef DEBUG_DZ
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/interrupt.h>
 #include <linux/init.h>
@@ -768,11 +767,7 @@ void __init dz_serial_console_init(void)
 static struct uart_driver dz_reg = {
         .owner                  = THIS_MODULE,
         .driver_name            = "serial",
-#ifdef CONFIG_DEVFS
-        .dev_name               = "tts/%d",
-#else
         .dev_name               = "ttyS%d",
-#endif
         .major                  = TTY_MAJOR,
         .minor                  = 64,
         .nr                     = DZ_NB_PORT,
@@ -802,7 +797,7 @@ int __init dz_init(void)
         restore_flags(flags);
 
         if (request_irq(dz_ports[0].port.irq, dz_interrupt,
-                        SA_INTERRUPT, "DZ", &dz_ports[0]))
+                        IRQF_DISABLED, "DZ", &dz_ports[0]))
                 panic("Unable to register DZ interrupt");
 
         ret = uart_register_driver(&dz_reg);