2 files changed, 1 insertions, 27 deletions

diff --git a/drivers/staging/lirc/Kconfig b/drivers/staging/lirc/Kconfig
index 100c4d4b8125..fa790db75d7e 100644
--- a/drivers/staging/lirc/Kconfig
+++ b/drivers/staging/lirc/Kconfig
@@ -53,7 +53,7 @@ config LIRC_ITE8709
 
 config LIRC_PARALLEL
         tristate "Homebrew Parallel Port Receiver"
-        depends on LIRC_STAGING && PARPORT && !SMP
+        depends on LIRC_STAGING && PARPORT
         help
           Driver for Homebrew Parallel Port Receivers
 
diff --git a/drivers/staging/lirc/lirc_parallel.c b/drivers/staging/lirc/lirc_parallel.c
index b8cce87c7032..884904c782d1 100644
--- a/drivers/staging/lirc/lirc_parallel.c
+++ b/drivers/staging/lirc/lirc_parallel.c
@@ -24,10 +24,6 @@
 
 /*** Includes ***/
 
-#ifdef CONFIG_SMP
-#error "--- Sorry, this driver is not SMP safe. ---"
-#endif
-
 #include <linux/module.h>
 #include <linux/sched.h>
 #include <linux/errno.h>
@@ -579,28 +575,6 @@ static struct lirc_driver driver = {
 static int pf(void *handle);
 static void kf(void *handle);
 
-static struct timer_list poll_timer;
-static void poll_state(unsigned long ignored);
-
-static void poll_state(unsigned long ignored)
-{
-        printk(KERN_NOTICE "%s: time\n",
-               LIRC_DRIVER_NAME);
-        del_timer(&poll_timer);
-        if (is_claimed)
-                return;
-        kf(NULL);
-        if (!is_claimed) {
-                printk(KERN_NOTICE "%s: could not claim port, giving up\n",
-                       LIRC_DRIVER_NAME);
-                init_timer(&poll_timer);
-                poll_timer.expires = jiffies + HZ;
-                poll_timer.data = (unsigned long)current;
-                poll_timer.function = poll_state;
-                add_timer(&poll_timer);
-        }
-}
-
 static int pf(void *handle)
 {
         parport_disable_irq(pport);