Home| summaryrefslogtreecommitdiff |
diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2002-11-17 04:27:01 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-11-17 04:27:01 -0800 |
| commit | a07eff8608bbd6bb7506c71bd49f5389c0f26ab3 (patch) | |
| tree | f3ff914b26a2898cd31b5f8ef70bfd965be1c8d8 | |
| parent | 23237a431d3f8aa43140166530ce458447aa3e9d (diff) | |
| parent | 006e4f38d51791a27fd5f14246dea56cad6e5d15 (diff) | |
Merge master.kernel.org:/home/acme/BK/includes-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
31 files changed, 117 insertions, 73 deletions
diff --git a/drivers/char/applicom.c b/drivers/char/applicom.c index 1972c2a15731..af61070b9707 100644 --- 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 4d8243f50522..6a4b746e6cd9 100644 --- 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 761b7f5bac96..d76c86c12b68 100644 --- 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 2c4aaa11a000..7bcafb16d21f 100644 --- 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 03473d07cc1b..33deb303e3d4 100644 --- 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 1e619bbdae5d..7f47b8c74f92 100644 --- 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) { } diff --git a/sound/drivers/serial-u16550.c b/sound/drivers/serial-u16550.c index 1c017312b1b8..60e64ff05563 100644 --- a/sound/drivers/serial-u16550.c +++ b/sound/drivers/serial-u16550.c @@ -31,8 +31,8 @@ */ #include <sound/driver.h> -#include <asm/io.h> #include <linux/init.h> +#include <linux/interrupt.h> #include <linux/slab.h> #include <linux/ioport.h> #include <sound/core.h> @@ -42,6 +42,8 @@ #include <linux/serial_reg.h> +#include <asm/io.h> + MODULE_DESCRIPTION("MIDI serial u16550"); MODULE_LICENSE("GPL"); MODULE_CLASSES("{sound}"); diff --git a/sound/isa/ad1848/ad1848_lib.c b/sound/isa/ad1848/ad1848_lib.c index 1601714e01f4..d36d57a2efa9 100644 --- a/sound/isa/ad1848/ad1848_lib.c +++ b/sound/isa/ad1848/ad1848_lib.c @@ -21,16 +21,18 @@ #define SNDRV_MAIN_OBJECT_FILE #include <sound/driver.h> -#include <asm/io.h> -#include <asm/dma.h> #include <linux/delay.h> #include <linux/init.h> +#include <linux/interrupt.h> #include <linux/slab.h> #include <linux/ioport.h> #include <sound/core.h> #include <sound/ad1848.h> #include <sound/pcm_params.h> +#include <asm/io.h> +#include <asm/dma.h> + MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>"); MODULE_DESCRIPTION("Routines for control of AD1848/AD1847/CS4248"); MODULE_LICENSE("GPL"); diff --git a/sound/isa/cs423x/cs4231_lib.c b/sound/isa/cs423x/cs4231_lib.c index 0982bba6b988..7c688deb8a50 100644 --- a/sound/isa/cs423x/cs4231_lib.c +++ b/sound/isa/cs423x/cs4231_lib.c @@ -25,18 +25,20 @@ */ #include <sound/driver.h> -#include <asm/io.h> -#include <asm/dma.h> -#include <asm/irq.h> #include <linux/delay.h> #include <linux/pm.h> #include <linux/init.h> +#include <linux/interrupt.h> #include <linux/slab.h> #include <linux/ioport.h> #include <sound/core.h> #include <sound/cs4231.h> #include <sound/pcm_params.h> +#include <asm/io.h> +#include <asm/dma.h> +#include <asm/irq.h> + MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>"); MODULE_DESCRIPTION("Routines for control of CS4231(A)/CS4232/InterWave & compatible chips"); MODULE_LICENSE("GPL"); diff --git a/sound/isa/es1688/es1688_lib.c b/sound/isa/es1688/es1688_lib.c index ceb3c69f58a8..c9b4d3701f2d 100644 --- a/sound/isa/es1688/es1688_lib.c +++ b/sound/isa/es1688/es1688_lib.c @@ -20,9 +20,8 @@ */ #include <sound/driver.h> -#include <asm/io.h> -#include <asm/dma.h> #include <linux/init.h> +#include <linux/interrupt.h> #include <linux/delay.h> #include <linux/slab.h> #include <linux/ioport.h> @@ -30,6 +29,9 @@ #include <sound/es1688.h> #include <sound/initval.h> +#include <asm/io.h> +#include <asm/dma.h> + MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>"); MODULE_DESCRIPTION("ESS ESx688 lowlevel module"); MODULE_CLASSES("{sound}"); diff --git a/sound/isa/gus/gus_main.c b/sound/isa/gus/gus_main.c index ac065e4ee45c..04fa4a649ab6 100644 --- a/sound/isa/gus/gus_main.c +++ b/sound/isa/gus/gus_main.c @@ -20,8 +20,8 @@ */ #include <sound/driver.h> -#include <asm/dma.h> #include <linux/init.h> +#include <linux/interrupt.h> #include <linux/delay.h> #include <linux/slab.h> #include <linux/ioport.h> @@ -29,6 +29,8 @@ #include <sound/gus.h> #include <sound/control.h> +#include <asm/dma.h> + MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>"); MODULE_DESCRIPTION("Routines for Gravis UltraSound soundcards"); MODULE_LICENSE("GPL"); diff --git a/sound/isa/opl3sa2.c b/sound/isa/opl3sa2.c index 5963bf1360f3..727f72e39572 100644 --- a/sound/isa/opl3sa2.c +++ b/sound/isa/opl3sa2.c @@ -20,8 +20,8 @@ */ #include <sound/driver.h> -#include <asm/io.h> #include <linux/init.h> +#include <linux/interrupt.h> #include <linux/pm.h> #include <linux/slab.h> #ifndef LINUX_ISAPNP_H @@ -36,6 +36,8 @@ #define SNDRV_GET_ID #include <sound/initval.h> +#include <asm/io.h> + MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>"); MODULE_DESCRIPTION("Yamaha OPL3SA2+"); MODULE_LICENSE("GPL"); diff --git a/sound/isa/sb/sb_common.c b/sound/isa/sb/sb_common.c index bac5aea53837..08237ab055c8 100644 --- a/sound/isa/sb/sb_common.c +++ b/sound/isa/sb/sb_common.c @@ -21,16 +21,18 @@ */ #include <sound/driver.h> -#include <asm/io.h> -#include <asm/dma.h> #include <linux/delay.h> #include <linux/init.h> +#include <linux/interrupt.h> #include <linux/slab.h> #include <linux/ioport.h> #include <sound/core.h> #include <sound/sb.h> #include <sound/initval.h> +#include <asm/io.h> +#include <asm/dma.h> + #define chip_t sb_t MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>"); diff --git a/sound/isa/wavefront/wavefront.c b/sound/isa/wavefront/wavefront.c index 01caf9dce231..34e0dc7bdd6d 100644 --- a/sound/isa/wavefront/wavefront.c +++ b/sound/isa/wavefront/wavefront.c @@ -21,6 +21,7 @@ #include <sound/driver.h> #include <linux/init.h> +#include <linux/interrupt.h> #include <linux/slab.h> #ifndef LINUX_ISAPNP_H #include <linux/isapnp.h> diff --git a/sound/oss/ad1816.c b/sound/oss/ad1816.c index 9f92e6129d28..c5418fd94040 100644 --- a/sound/oss/ad1816.c +++ b/sound/oss/ad1816.c @@ -35,6 +35,7 @@ #include <linux/config.h> #include <linux/module.h> #include <linux/init.h> +#include <linux/interrupt.h> #include <linux/isapnp.h> #include <linux/stddef.h> #include <linux/spinlock.h> diff --git a/sound/oss/ad1848.c b/sound/oss/ad1848.c index b0b848f220b5..58efdee1b416 100644 --- a/sound/oss/ad1848.c +++ b/sound/oss/ad1848.c @@ -43,6 +43,7 @@ #include <linux/config.h> #include <linux/init.h> +#include <linux/interrupt.h> #include <linux/module.h> #include <linux/stddef.h> #include <linux/pm.h> diff --git a/sound/oss/cmpci.c b/sound/oss/cmpci.c index 488db9116587..6899454d7c28 100644 --- a/sound/oss/cmpci.c +++ b/sound/oss/cmpci.c @@ -90,6 +90,7 @@ #include <linux/config.h> #include <linux/module.h> #include <linux/string.h> +#include <linux/interrupt.h> #include <linux/ioport.h> #include <linux/sched.h> #include <linux/delay.h> @@ -98,15 +99,16 @@ #include <linux/soundcard.h> #include <linux/pci.h> #include <linux/wrapper.h> -#include <asm/io.h> -#include <asm/dma.h> #include <linux/init.h> #include <linux/poll.h> #include <linux/spinlock.h> #include <linux/smp_lock.h> -#include <asm/uaccess.h> -#include <asm/hardirq.h> #include <linux/bitops.h> +#include <linux/wait.h> + +#include <asm/io.h> +#include <asm/page.h> +#include <asm/uaccess.h> #include "dm.h" @@ -1466,11 +1468,11 @@ static int cm_ioctl_mixdev(struct inode *inode, struct file *file, unsigned int } static /*const*/ struct file_operations cm_mixer_fops = { - owner: THIS_MODULE, - llseek: no_llseek, - ioctl: cm_ioctl_mixdev, - open: cm_open_mixdev, - release: cm_release_mixdev, + .owner = THIS_MODULE, + .llseek = no_llseek, + .ioctl = cm_ioctl_mixdev, + .open = cm_open_mixdev, + .release = cm_release_mixdev, }; @@ -2278,15 +2280,15 @@ static int cm_release(struct inode *inode, struct file *file) } static /*const*/ struct file_operations cm_audio_fops = { - owner: THIS_MODULE, - llseek: no_llseek, - read: cm_read, - write: cm_write, - poll: cm_poll, - ioctl: cm_ioctl, - mmap: cm_mmap, - open: cm_open, - release: cm_release, + .owner = THIS_MODULE, + .llseek = no_llseek, + .read = cm_read, + .write = cm_write, + .poll = cm_poll, + .ioctl = cm_ioctl, + .mmap = cm_mmap, + .open = cm_open, + .release = cm_release, }; #ifdef CONFIG_SOUND_CMPCI_MIDI @@ -2556,13 +2558,13 @@ static int cm_midi_release(struct inode *inode, struct file *file) } static /*const*/ struct file_operations cm_midi_fops = { - owner: THIS_MODULE, - llseek: no_llseek, - read: cm_midi_read, - write: cm_midi_write, - poll: cm_midi_poll, - open: cm_midi_open, - release: cm_midi_release, + .owner = THIS_MODULE, + .llseek = no_llseek, + .read = cm_midi_read, + .write = cm_midi_write, + .poll = cm_midi_poll, + .open = cm_midi_open, + .release = cm_midi_release, }; #endif @@ -2722,11 +2724,11 @@ static int cm_dmfm_release(struct inode *inode, struct file *file) } static /*const*/ struct file_operations cm_dmfm_fops = { - owner: THIS_MODULE, - llseek: no_llseek, - ioctl: cm_dmfm_ioctl, - open: cm_dmfm_open, - release: cm_dmfm_release, + .owner = THIS_MODULE, + .llseek = no_llseek, + .ioctl = cm_dmfm_ioctl, + .open = cm_dmfm_open, + .release = cm_dmfm_release, }; #endif /* CONFIG_SOUND_CMPCI_FM */ diff --git a/sound/oss/es1370.c b/sound/oss/es1370.c index 627982324488..fe7e971804ca 100644 --- a/sound/oss/es1370.c +++ b/sound/oss/es1370.c @@ -140,6 +140,7 @@ /*****************************************************************************/ #include <linux/version.h> +#include <linux/interrupt.h> #include <linux/module.h> #include <linux/string.h> #include <linux/ioport.h> @@ -151,14 +152,15 @@ #include <linux/pci.h> #include <linux/smp_lock.h> #include <linux/wrapper.h> -#include <asm/io.h> -#include <asm/dma.h> #include <linux/init.h> #include <linux/poll.h> #include <linux/spinlock.h> -#include <asm/uaccess.h> -#include <asm/hardirq.h> #include <linux/gameport.h> +#include <linux/wait.h> + +#include <asm/io.h> +#include <asm/page.h> +#include <asm/uaccess.h> /* --------------------------------------------------------------------- */ diff --git a/sound/oss/es1371.c b/sound/oss/es1371.c index 1ccf86a85480..0c4baff6b170 100644 --- a/sound/oss/es1371.c +++ b/sound/oss/es1371.c @@ -109,6 +109,7 @@ /*****************************************************************************/ #include <linux/version.h> +#include <linux/interrupt.h> #include <linux/module.h> #include <linux/string.h> #include <linux/ioport.h> @@ -126,11 +127,12 @@ #include <linux/smp_lock.h> #include <linux/ac97_codec.h> #include <linux/wrapper.h> +#include <linux/gameport.h> +#include <linux/wait.h> + #include <asm/io.h> -#include <asm/dma.h> +#include <asm/page.h> #include <asm/uaccess.h> -#include <asm/hardirq.h> -#include <linux/gameport.h> /* --------------------------------------------------------------------- */ diff --git a/sound/oss/esssolo1.c b/sound/oss/esssolo1.c index e4c002f33521..e1a1408bee54 100644 --- a/sound/oss/esssolo1.c +++ b/sound/oss/esssolo1.c @@ -87,6 +87,7 @@ /*****************************************************************************/ #include <linux/version.h> +#include <linux/interrupt.h> #include <linux/module.h> #include <linux/string.h> #include <linux/ioport.h> @@ -97,16 +98,17 @@ #include <linux/soundcard.h> #include <linux/pci.h> #include <linux/bitops.h> -#include <asm/io.h> -#include <asm/dma.h> #include <linux/init.h> #include <linux/poll.h> #include <linux/spinlock.h> #include <linux/smp_lock.h> #include <linux/wrapper.h> -#include <asm/uaccess.h> -#include <asm/hardirq.h> #include <linux/gameport.h> +#include <linux/wait.h> + +#include <asm/io.h> +#include <asm/page.h> +#include <asm/uaccess.h> #include "dm.h" diff --git a/sound/oss/gus_card.c b/sound/oss/gus_card.c index 022f94bfbb73..4d308f21bae9 100644 --- a/sound/oss/gus_card.c +++ b/sound/oss/gus_card.c @@ -17,6 +17,7 @@ #include <linux/config.h> #include <linux/init.h> +#include <linux/interrupt.h> #include <linux/module.h> #include "sound_config.h" diff --git a/sound/oss/i810_audio.c b/sound/oss/i810_audio.c index ab49298c6a23..839a66312121 100644 --- a/sound/oss/i810_audio.c +++ b/sound/oss/i810_audio.c @@ -70,24 +70,24 @@ #include <linux/module.h> #include <linux/version.h> #include <linux/string.h> -#include <linux/ctype.h> +#include <linux/interrupt.h> #include <linux/ioport.h> -#include <linux/sched.h> +#include <linux/wait.h> #include <linux/delay.h> #include <linux/sound.h> #include <linux/slab.h> #include <linux/soundcard.h> #include <linux/pci.h> -#include <asm/io.h> -#include <asm/dma.h> #include <linux/init.h> #include <linux/poll.h> #include <linux/spinlock.h> #include <linux/smp_lock.h> #include <linux/ac97_codec.h> #include <linux/wrapper.h> + +#include <asm/io.h> +#include <asm/page.h> #include <asm/uaccess.h> -#include <asm/hardirq.h> #ifndef PCI_DEVICE_ID_INTEL_82801 #define PCI_DEVICE_ID_INTEL_82801 0x2415 diff --git a/sound/oss/mpu401.c b/sound/oss/mpu401.c index 38ae0aaf95ca..a25f30980f86 100644 --- a/sound/oss/mpu401.c +++ b/sound/oss/mpu401.c @@ -19,6 +19,7 @@ #include <linux/module.h> #include <linux/init.h> +#include <linux/interrupt.h> #include <linux/spinlock.h> #define USE_SEQ_MACROS #define USE_SIMPLE_MACROS diff --git a/sound/oss/nm256_audio.c b/sound/oss/nm256_audio.c index 891ebf311798..53faa51a9ed2 100644 --- a/sound/oss/nm256_audio.c +++ b/sound/oss/nm256_audio.c @@ -22,6 +22,7 @@ #define __NO_VERSION__ #include <linux/pci.h> #include <linux/init.h> +#include <linux/interrupt.h> #include <linux/module.h> #include <linux/pm.h> #include <linux/delay.h> diff --git a/sound/oss/pas2_card.c b/sound/oss/pas2_card.c index 2c9abeba2bad..4fd5bd183de1 100644 --- a/sound/oss/pas2_card.c +++ b/sound/oss/pas2_card.c @@ -6,6 +6,7 @@ #include <linux/config.h> #include <linux/init.h> +#include <linux/interrupt.h> #include <linux/module.h> #include <linux/spinlock.h> #include "sound_config.h" diff --git a/sound/oss/sb_common.c b/sound/oss/sb_common.c index 49349773bb07..fe8f782fa4e9 100644 --- a/sound/oss/sb_common.c +++ b/sound/oss/sb_common.c @@ -28,6 +28,7 @@ #include <linux/config.h> #include <linux/init.h> +#include <linux/interrupt.h> #include <linux/module.h> #include <linux/delay.h> #include <linux/spinlock.h> diff --git a/sound/oss/sonicvibes.c b/sound/oss/sonicvibes.c index eb0bcfb9c1d4..79c35a9c53a9 100644 --- a/sound/oss/sonicvibes.c +++ b/sound/oss/sonicvibes.c @@ -103,23 +103,24 @@ #include <linux/module.h> #include <linux/string.h> #include <linux/ioport.h> -#include <linux/sched.h> +#include <linux/interrupt.h> +#include <linux/wait.h> +#include <linux/mm.h> #include <linux/delay.h> #include <linux/sound.h> #include <linux/slab.h> #include <linux/soundcard.h> #include <linux/pci.h> -#include <asm/io.h> -#include <asm/dma.h> #include <linux/init.h> #include <linux/poll.h> #include <linux/spinlock.h> #include <linux/smp_lock.h> #include <linux/wrapper.h> -#include <asm/uaccess.h> -#include <asm/hardirq.h> #include <linux/gameport.h> +#include <asm/io.h> +#include <asm/uaccess.h> + #include "dm.h" diff --git a/sound/oss/uart401.c b/sound/oss/uart401.c index 6785a4f345d2..86b3fd6f0069 100644 --- a/sound/oss/uart401.c +++ b/sound/oss/uart401.c @@ -22,6 +22,7 @@ */ #include <linux/init.h> +#include <linux/interrupt.h> #include <linux/module.h> #include <linux/spinlock.h> #include "sound_config.h" diff --git a/sound/oss/uart6850.c b/sound/oss/uart6850.c index b16ff74a268c..c8686fed360a 100644 --- a/sound/oss/uart6850.c +++ b/sound/oss/uart6850.c @@ -22,6 +22,7 @@ */ #include <linux/init.h> +#include <linux/interrupt.h> #include <linux/module.h> #include <linux/spinlock.h> /* Mon Nov 22 22:38:35 MET 1993 marco@driq.home.usn.nl: diff --git a/sound/oss/via82cxxx_audio.c b/sound/oss/via82cxxx_audio.c index dfc91e675b38..8dd2a009c583 100644 --- a/sound/oss/via82cxxx_audio.c +++ b/sound/oss/via82cxxx_audio.c @@ -22,6 +22,7 @@ #include <linux/mm.h> #include <linux/pci.h> #include <linux/init.h> +#include <linux/interrupt.h> #include <linux/proc_fs.h> #include <linux/spinlock.h> #include <linux/sound.h> @@ -34,7 +35,6 @@ #include <linux/delay.h> #include <asm/io.h> #include <asm/uaccess.h> -#include <asm/hardirq.h> #include <asm/semaphore.h> #include "sound_config.h" #include "dev_table.h" diff --git a/sound/oss/ymfpci.c b/sound/oss/ymfpci.c index c7bacf23aa34..7b02ce17d477 100644 --- a/sound/oss/ymfpci.c +++ b/sound/oss/ymfpci.c @@ -54,6 +54,7 @@ #include <linux/config.h> #include <linux/module.h> #include <linux/init.h> +#include <linux/interrupt.h> #include <linux/ioport.h> #include <linux/delay.h> #include <linux/pci.h> |