From 99d98a883e55675758c9192e888fd5f65a715241 Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@kernel.org>
Date: Sat, 27 Oct 2007 23:42:54 -0400
Subject: [PATCH] --- yaml --- r: 73033 b: refs/heads/master c:
 167ebf760fcecf72824756c8235e2d30f050bedd h: refs/heads/master i:   73031:
 e003c6a5aeabe603bf92249e02b66766e9b98d11 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/input/serio/hp_sdc.c | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 7530214626b7..555f2b3c132f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eb9ebe677d7b4d94ca1bb2677f73a64d70dda24c
+refs/heads/master: 167ebf760fcecf72824756c8235e2d30f050bedd
diff --git a/trunk/drivers/input/serio/hp_sdc.c b/trunk/drivers/input/serio/hp_sdc.c
index 6af199805ffc..02b3ad8c0826 100644
--- a/trunk/drivers/input/serio/hp_sdc.c
+++ b/trunk/drivers/input/serio/hp_sdc.c
@@ -944,11 +944,7 @@ static int __init hp_sdc_init_hppa(struct parisc_device *d)
 
 #endif /* __hppa__ */
 
-#if !defined(__mc68000__) /* Link error on m68k! */
-static void __exit hp_sdc_exit(void)
-#else
 static void hp_sdc_exit(void)
-#endif
 {
 	write_lock_irq(&hp_sdc.lock);