Commit 36f9e5f4 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] misc fixes

- non_fatal.c comment fix (Zwane Mwaikambo <zwane@linuxpower.ca>)

- s/elevator/io scheduler/ in ll_rw_blk.c (Jens)

- update KJ mailing list address ("Randy.Dunlap" <rddunlap@osdl.org>)

- unused var in riscom8.c (Adrian Bunk <bunk@fs.tum.de>)

- add help texts to two OSS drivers (Adrian Bunk <bunk@fs.tum.de>)

- "PCMCIA SCSI adapter support" requires CONFIG_MODULES (Adrian Bunk
  <bunk@fs.tum.de>)
parent b5984adb
......@@ -1088,7 +1088,7 @@ S: Maintained
KERNEL JANITORS
P: Several
L: kernel-janitor-discuss@lists.sf.net
L: kernel-janitors@osdl.org
W: http://www.kerneljanitors.org/
W: http://sf.net/projects/kernel-janitor/
W: http://developer.osdl.org/rddunlap/kj-patches/
......
/*
* P4 specific Machine Check Exception Reporting
* Non Fatal Machine Check Exception Reporting
*/
#include <linux/init.h>
......
......@@ -1036,7 +1036,6 @@ static int rc_open(struct tty_struct * tty, struct file * filp)
int error;
struct riscom_port * port;
struct riscom_board * bp;
unsigned long flags;
board = RC_BOARD(tty->index);
if (board >= RC_NBOARD || !(rc_board[board].flags & RC_BOARD_PRESENT))
......
......@@ -3,7 +3,7 @@
#
menu "PCMCIA SCSI adapter support"
depends on SCSI!=n && PCMCIA!=n
depends on SCSI!=n && PCMCIA!=n && MODULES
config PCMCIA_AHA152X
tristate "Adaptec AHA152X PCMCIA support"
......
......@@ -1145,10 +1145,18 @@ config SOUND_ALI5455
config SOUND_FORTE
tristate "ForteMedia FM801 driver"
depends on SOUND_PRIME!=n && PCI
help
Say Y or M if you want driver support for the ForteMedia FM801 PCI
audio controller (Abit AU10, Genius Sound Maker, HP Workstation
zx2000, and others).
config SOUND_RME96XX
tristate "RME Hammerfall (RME96XX) support"
depends on SOUND_PRIME!=n && PCI
help
Say Y or M if you have a Hammerfall or Hammerfall light
multichannel card from RME. If you want to acess advanced
features of the card, read Documentation/sound/rme96xx.
config SOUND_AD1980
tristate "AD1980 front/back switch plugin"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment