Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
a07eff86
Commit
a07eff86
authored
Nov 17, 2002
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge master.kernel.org:/home/acme/BK/includes-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
parents
23237a43
006e4f38
Changes
31
Hide whitespace changes
Inline
Side-by-side
Showing
31 changed files
with
117 additions
and
73 deletions
+117
-73
drivers/char/applicom.c
drivers/char/applicom.c
+5
-3
drivers/char/rtc.c
drivers/char/rtc.c
+3
-1
drivers/char/sonypi.c
drivers/char/sonypi.c
+3
-0
drivers/char/tpqic02.c
drivers/char/tpqic02.c
+1
-0
drivers/char/wdt.c
drivers/char/wdt.c
+5
-5
include/sound/initval.h
include/sound/initval.h
+2
-0
sound/drivers/serial-u16550.c
sound/drivers/serial-u16550.c
+3
-1
sound/isa/ad1848/ad1848_lib.c
sound/isa/ad1848/ad1848_lib.c
+4
-2
sound/isa/cs423x/cs4231_lib.c
sound/isa/cs423x/cs4231_lib.c
+5
-3
sound/isa/es1688/es1688_lib.c
sound/isa/es1688/es1688_lib.c
+4
-2
sound/isa/gus/gus_main.c
sound/isa/gus/gus_main.c
+3
-1
sound/isa/opl3sa2.c
sound/isa/opl3sa2.c
+3
-1
sound/isa/sb/sb_common.c
sound/isa/sb/sb_common.c
+4
-2
sound/isa/wavefront/wavefront.c
sound/isa/wavefront/wavefront.c
+1
-0
sound/oss/ad1816.c
sound/oss/ad1816.c
+1
-0
sound/oss/ad1848.c
sound/oss/ad1848.c
+1
-0
sound/oss/cmpci.c
sound/oss/cmpci.c
+32
-30
sound/oss/es1370.c
sound/oss/es1370.c
+6
-4
sound/oss/es1371.c
sound/oss/es1371.c
+5
-3
sound/oss/esssolo1.c
sound/oss/esssolo1.c
+6
-4
sound/oss/gus_card.c
sound/oss/gus_card.c
+1
-0
sound/oss/i810_audio.c
sound/oss/i810_audio.c
+5
-5
sound/oss/mpu401.c
sound/oss/mpu401.c
+1
-0
sound/oss/nm256_audio.c
sound/oss/nm256_audio.c
+1
-0
sound/oss/pas2_card.c
sound/oss/pas2_card.c
+1
-0
sound/oss/sb_common.c
sound/oss/sb_common.c
+1
-0
sound/oss/sonicvibes.c
sound/oss/sonicvibes.c
+6
-5
sound/oss/uart401.c
sound/oss/uart401.c
+1
-0
sound/oss/uart6850.c
sound/oss/uart6850.c
+1
-0
sound/oss/via82cxxx_audio.c
sound/oss/via82cxxx_audio.c
+1
-1
sound/oss/ymfpci.c
sound/oss/ymfpci.c
+1
-0
No files found.
drivers/char/applicom.c
View file @
a07eff86
...
...
@@ -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
...
...
drivers/char/rtc.c
View file @
a07eff86
...
...
@@ -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>
...
...
drivers/char/sonypi.c
View file @
a07eff86
...
...
@@ -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>
...
...
drivers/char/tpqic02.c
View file @
a07eff86
...
...
@@ -77,6 +77,7 @@
#include <linux/config.h>
#include <linux/interrupt.h>
#include <linux/sched.h>
#include <linux/timer.h>
#include <linux/fs.h>
...
...
drivers/char/wdt.c
View file @
a07eff86
...
...
@@ -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
;
/*
...
...
include/sound/initval.h
View file @
a07eff86
...
...
@@ -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
)
{
}
...
...
sound/drivers/serial-u16550.c
View file @
a07eff86
...
...
@@ -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}"
);
...
...
sound/isa/ad1848/ad1848_lib.c
View file @
a07eff86
...
...
@@ -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"
);
...
...
sound/isa/cs423x/cs4231_lib.c
View file @
a07eff86
...
...
@@ -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"
);
...
...
sound/isa/es1688/es1688_lib.c
View file @
a07eff86
...
...
@@ -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}"
);
...
...
sound/isa/gus/gus_main.c
View file @
a07eff86
...
...
@@ -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"
);
...
...
sound/isa/opl3sa2.c
View file @
a07eff86
...
...
@@ -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"
);
...
...
sound/isa/sb/sb_common.c
View file @
a07eff86
...
...
@@ -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>"
);
...
...
sound/isa/wavefront/wavefront.c
View file @
a07eff86
...
...
@@ -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>
...
...
sound/oss/ad1816.c
View file @
a07eff86
...
...
@@ -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>
...
...
sound/oss/ad1848.c
View file @
a07eff86
...
...
@@ -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>
...
...
sound/oss/cmpci.c
View file @
a07eff86
...
...
@@ -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 */
...
...
sound/oss/es1370.c
View file @
a07eff86
...
...
@@ -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>
/* --------------------------------------------------------------------- */
...
...
sound/oss/es1371.c
View file @
a07eff86
...
...
@@ -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>
/* --------------------------------------------------------------------- */
...
...
sound/oss/esssolo1.c
View file @
a07eff86
...
...
@@ -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"
...
...
sound/oss/gus_card.c
View file @
a07eff86
...
...
@@ -17,6 +17,7 @@
#include <linux/config.h>
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/module.h>
#include "sound_config.h"
...
...
sound/oss/i810_audio.c
View file @
a07eff86
...
...
@@ -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
...
...
sound/oss/mpu401.c
View file @
a07eff86
...
...
@@ -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
...
...
sound/oss/nm256_audio.c
View file @
a07eff86
...
...
@@ -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>
...
...
sound/oss/pas2_card.c
View file @
a07eff86
...
...
@@ -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"
...
...
sound/oss/sb_common.c
View file @
a07eff86
...
...
@@ -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>
...
...
sound/oss/sonicvibes.c
View file @
a07eff86
...
...
@@ -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"
...
...
sound/oss/uart401.c
View file @
a07eff86
...
...
@@ -22,6 +22,7 @@
*/
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/module.h>
#include <linux/spinlock.h>
#include "sound_config.h"
...
...
sound/oss/uart6850.c
View file @
a07eff86
...
...
@@ -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:
...
...
sound/oss/via82cxxx_audio.c
View file @
a07eff86
...
...
@@ -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"
...
...
sound/oss/ymfpci.c
View file @
a07eff86
...
...
@@ -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>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment