1 files changed, 2 insertions, 3 deletions

diff --git a/drivers/char/nwbutton.c b/drivers/char/nwbutton.c
index 4083b781adbf..7c57ebfa8640 100644
--- a/drivers/char/nwbutton.c
+++ b/drivers/char/nwbutton.c
@@ -4,7 +4,6 @@
  *
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
@@ -184,7 +183,7 @@ static int button_read (struct file *filp, char __user *buffer,
  * attempts to perform these operations on the device.
  */
 
-static struct file_operations button_fops = {
+static const struct file_operations button_fops = {
         .owner          = THIS_MODULE,
         .read           = button_read,
 };
@@ -224,7 +223,7 @@ static int __init nwbutton_init(void)
                 return -EBUSY;
         }
 
-        if (request_irq (IRQ_NETWINDER_BUTTON, button_handler, SA_INTERRUPT,
+        if (request_irq (IRQ_NETWINDER_BUTTON, button_handler, IRQF_DISABLED,
                         "nwbutton", NULL)) {
                 printk (KERN_WARNING "nwbutton: IRQ %d is not free.\n",
                                 IRQ_NETWINDER_BUTTON);