o char: fix up header cleanups: include linux/interrupt.h

Also there is one sound header that was modified in the same way.

diff --git a/drivers/char/applicom.c b/drivers/char/applicom.c
index 1972c2a15731a689d2acb8d63a65c6918b6baa06..af61070b9707c97d158dbdedf3ea87d63c8f02fa 100644 (file)
--- a/drivers/char/applicom.c
+++ b/drivers/char/applicom.c
@@ -22,16 +22,18 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/interrupt.h>
 #include <linux/slab.h>
-#include <asm/errno.h>
-#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/errno.h>
 #include <linux/miscdevice.h>
 #include <linux/pci.h>
 #include <linux/wait.h>
 #include <linux/init.h>
 #include <linux/compatmac.h>
 
+#include <asm/io.h>
+#include <asm/uaccess.h>
+
 #include "applicom.h"
 
 #if LINUX_VERSION_CODE < 0x20300 

diff --git a/drivers/char/rtc.c b/drivers/char/rtc.c
index 4d8243f505223994912d7f8d9e9a464534ce4d9f..6a4b746e6cd93ee03b8369635e60aa38df88b628 100644 (file)
--- a/drivers/char/rtc.c
+++ b/drivers/char/rtc.c
@@ -58,6 +58,7 @@
  */
 
 #include <linux/config.h>
+#include <linux/interrupt.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
@@ -70,8 +71,9 @@
 #include <linux/proc_fs.h>
 #include <linux/spinlock.h>
 #include <linux/sysctl.h>
+#include <linux/wait.h>
 
-#include <asm/io.h>
+#include <asm/current.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>
 

diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
index 761b7f5bac96c4634dc67feb0fbf60946dc2a9a1..d76c86c12b68b6f4ba657fe723206788c6205d89 100644 (file)
--- a/drivers/char/sonypi.c
+++ b/drivers/char/sonypi.c
@@ -34,9 +34,12 @@
 #include <linux/pci.h>
 #include <linux/sched.h>
 #include <linux/init.h>
+#include <linux/interrupt.h>
 #include <linux/miscdevice.h>
 #include <linux/poll.h>
 #include <linux/delay.h>
+#include <linux/wait.h>
+
 #include <asm/uaccess.h>
 #include <asm/io.h>
 #include <asm/system.h>

diff --git a/drivers/char/tpqic02.c b/drivers/char/tpqic02.c
index 729ae0d02a5bf443bacf6704c9b510414698be62..1500c25b2c1271fc6ddeb89e3a224bdeb0c350ef 100644 (file)
--- a/drivers/char/tpqic02.c
+++ b/drivers/char/tpqic02.c
@@ -77,6 +77,7 @@
 
 #include <linux/config.h>
 
+#include <linux/interrupt.h>
 #include <linux/sched.h>
 #include <linux/timer.h>
 #include <linux/fs.h>

diff --git a/drivers/char/wdt.c b/drivers/char/wdt.c
index 03473d07cc1bc52cd12789f8e0c29ef585ed23a5..33deb303e3d40a1af2f881f30c2b2ae800cbb0d5 100644 (file)
--- a/drivers/char/wdt.c
+++ b/drivers/char/wdt.c
@@ -31,26 +31,26 @@
  */
 
 #include <linux/config.h>
+#include <linux/interrupt.h>
 #include <linux/module.h>
 #include <linux/version.h>
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
-#include <linux/sched.h>
-#include <linux/smp_lock.h>
 #include <linux/miscdevice.h>
 #include <linux/watchdog.h>
 #include "wd501p.h"
 #include <linux/slab.h>
 #include <linux/ioport.h>
 #include <linux/fcntl.h>
-#include <asm/io.h>
-#include <asm/uaccess.h>
-#include <asm/system.h>
 #include <linux/notifier.h>
 #include <linux/reboot.h>
 #include <linux/init.h>
 
+#include <asm/io.h>
+#include <asm/uaccess.h>
+#include <asm/system.h>
+
 static unsigned long wdt_is_open;
 
 /*

diff --git a/include/sound/initval.h b/include/sound/initval.h
index 1e619bbdae5d738a5c2fa8714c31057bb6b6ec2a..7f47b8c74f921a045ae34864d9751a85ab78ca0e 100644 (file)
--- a/include/sound/initval.h
+++ b/include/sound/initval.h
@@ -110,6 +110,8 @@ static long snd_legacy_find_free_ioport(long *port_table, long size)
 #endif
 
 #ifdef SNDRV_LEGACY_FIND_FREE_IRQ
+#include <linux/interrupt.h>
+
 static void snd_legacy_empty_irq_handler(int irq, void *dev_id, struct pt_regs *regs)
 {
 }