[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>)

diff --git a/MAINTAINERS b/MAINTAINERS
index 76557f42ec2ed23103b6a83c9726965278165097..d9d91b3b4eca241e6b63c33fb138ec15ea6046e1 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -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/

diff --git a/arch/i386/kernel/cpu/mcheck/non-fatal.c b/arch/i386/kernel/cpu/mcheck/non-fatal.c
index f657dc87ccbceed95f1dbb56a4d5a857da5dc08d..099f9d2efe13cf2718d4d2a71eb33bfe3edf9087 100644 (file)
--- a/arch/i386/kernel/cpu/mcheck/non-fatal.c
+++ b/arch/i386/kernel/cpu/mcheck/non-fatal.c
@@ -1,5 +1,5 @@
 /*
- * P4 specific Machine Check Exception Reporting
+ * Non Fatal Machine Check Exception Reporting
  */
 
 #include <linux/init.h>

diff --git a/drivers/char/riscom8.c b/drivers/char/riscom8.c
index 0ee79ab3d93a0269b12fd0b8b4f7a411b39f1364..96221c5601c3614bf543b0ca7b982fb8c33ea1f1 100644 (file)
--- a/drivers/char/riscom8.c
+++ b/drivers/char/riscom8.c
@@ -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))

diff --git a/drivers/scsi/pcmcia/Kconfig b/drivers/scsi/pcmcia/Kconfig
index 4cadd40bca98cf7cda82361144f9ed24c0e10187..4eda8c41cff5e8fc71175190536f6fc9959714d0 100644 (file)
--- a/drivers/scsi/pcmcia/Kconfig
+++ b/drivers/scsi/pcmcia/Kconfig
@@ -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"

diff --git a/sound/oss/Kconfig b/sound/oss/Kconfig
index 2fd75db6ea7158f86469a67a0e9b7ee1bf7a22d0..6f5956b25f0b61c52be7f8079625e06b25376935 100644 (file)
--- a/sound/oss/Kconfig
+++ b/sound/oss/Kconfig
@@ -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"