aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-10-03 19:35:11 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-03 19:35:11 -0400
commit708e16892e1646594a29eaa7ac7b209b600b9fd2 (patch)
treefe7c31bc0edef84eb1075c7e195340047d6aaa17 /drivers
parentf3c87a8999c28f2948ebd407574f7e9fb5c577b2 (diff)
parenta847825970e741e20a09c659978baa34016b63bc (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (39 commits) Add missing maintainer countries in CREDITS Fix bytes <-> kilobytes typo in Kconfig for ramdisk fix a typo in Documentation/pi-futex.txt BUG_ON conversion for fs/xfs/ BUG_ON() conversion in fs/nfsd/ BUG_ON conversion for fs/reiserfs BUG_ON cleanups in arch/i386 BUG_ON cleanup in drivers/net/tokenring/ BUG_ON cleanup for drivers/md/ kerneldoc-typo in led-class.c debugfs: spelling fix rcutorture: Fix incorrect description of default for nreaders parameter parport: Remove space in function calls Michal Wronski: update contact info Spelling fix: "control" instead of "cotrol" reboot parameter in Documentation/kernel-parameters.txt Fix copy&waste bug in comment in scripts/kernel-doc remove duplicate "until" from kernel/workqueue.c ite_gpio fix tabbage fix file specification in comments ... Fixed trivial path conflicts due to removed files: arch/mips/dec/boot/decstation.c, drivers/char/ite_gpio.c
Diffstat (limited to 'drivers')
-rw-r--r--drivers/acorn/block/mfmhd.c2
-rw-r--r--drivers/acpi/Kconfig6
-rw-r--r--drivers/block/Kconfig5
-rw-r--r--drivers/cdrom/cdrom.c2
-rw-r--r--drivers/char/hw_random/ixp4xx-rng.c2
-rw-r--r--drivers/char/hw_random/omap-rng.c2
-rw-r--r--drivers/char/mwave/README5
-rw-r--r--drivers/char/watchdog/ixp2000_wdt.c2
-rw-r--r--drivers/char/watchdog/ixp4xx_wdt.c2
-rw-r--r--drivers/firmware/Kconfig2
-rw-r--r--drivers/firmware/edd.c2
-rw-r--r--drivers/i2c/busses/Kconfig4
-rw-r--r--drivers/i2c/busses/i2c-ibm_iic.c2
-rw-r--r--drivers/i2c/busses/i2c-ibm_iic.h2
-rw-r--r--drivers/i2c/busses/i2c-ixp4xx.c2
-rw-r--r--drivers/i2c/busses/scx200_i2c.c2
-rw-r--r--drivers/ide/h8300/ide-h8300.c2
-rw-r--r--drivers/ide/ppc/pmac.c2
-rw-r--r--drivers/ieee1394/Kconfig2
-rw-r--r--drivers/infiniband/ulp/ipoib/Kconfig2
-rw-r--r--drivers/input/joystick/Kconfig2
-rw-r--r--drivers/input/keyboard/Kconfig2
-rw-r--r--drivers/input/serio/Kconfig4
-rw-r--r--drivers/isdn/hardware/eicon/Kconfig2
-rw-r--r--drivers/isdn/hisax/Kconfig2
-rw-r--r--drivers/isdn/hisax/amd7930_fn.h2
-rw-r--r--drivers/leds/led-class.c2
-rw-r--r--drivers/leds/leds-locomo.c2
-rw-r--r--drivers/macintosh/Kconfig2
-rw-r--r--drivers/macintosh/adbhid.c2
-rw-r--r--drivers/md/md.c3
-rw-r--r--drivers/md/raid5.c2
-rw-r--r--drivers/media/dvb/cinergyT2/Kconfig2
-rw-r--r--drivers/media/radio/Kconfig3
-rw-r--r--drivers/media/video/Kconfig2
-rw-r--r--drivers/media/video/cx88/Kconfig2
-rw-r--r--drivers/media/video/pwc/philips.txt4
-rw-r--r--drivers/mtd/chips/Kconfig2
-rw-r--r--drivers/mtd/maps/bast-flash.c2
-rw-r--r--drivers/mtd/maps/dmv182.c2
-rw-r--r--drivers/mtd/nand/Kconfig2
-rw-r--r--drivers/mtd/onenand/Kconfig2
-rw-r--r--drivers/net/Kconfig2
-rw-r--r--drivers/net/arm/am79c961a.h2
-rw-r--r--drivers/net/ibm_emac/ibm_emac_debug.h2
-rw-r--r--drivers/net/ibm_emac/ibm_emac_rgmii.h2
-rw-r--r--drivers/net/tokenring/tmspci.c3
-rw-r--r--drivers/net/wireless/Kconfig2
-rw-r--r--drivers/parisc/power.c2
-rw-r--r--drivers/parport/daisy.c212
-rw-r--r--drivers/pci/hotplug/Kconfig2
-rw-r--r--drivers/rapidio/Kconfig2
-rw-r--r--drivers/rtc/rtc-max6902.c2
-rw-r--r--drivers/sbus/char/cpwatchdog.c2
-rw-r--r--drivers/scsi/Kconfig6
-rw-r--r--drivers/scsi/aic7xxx/Kconfig.aic79xx4
-rw-r--r--drivers/scsi/aic7xxx/Kconfig.aic7xxx4
-rw-r--r--drivers/scsi/arm/arxescsi.c2
-rw-r--r--drivers/serial/21285.c2
-rw-r--r--drivers/serial/Kconfig6
-rw-r--r--drivers/serial/cpm_uart/cpm_uart_cpm1.h2
-rw-r--r--drivers/serial/cpm_uart/cpm_uart_cpm2.h2
-rw-r--r--drivers/usb/atm/Kconfig2
-rw-r--r--drivers/usb/core/file.c2
-rw-r--r--drivers/usb/core/usb.c2
-rw-r--r--drivers/usb/gadget/Kconfig2
-rw-r--r--drivers/usb/storage/Kconfig2
-rw-r--r--drivers/video/Kconfig10
-rw-r--r--drivers/video/s3c2410fb.h2
-rw-r--r--drivers/w1/Kconfig2
70 files changed, 190 insertions, 199 deletions
diff --git a/drivers/acorn/block/mfmhd.c b/drivers/acorn/block/mfmhd.c
index 3dd6b7bb5d35..1bace29f4b6a 100644
--- a/drivers/acorn/block/mfmhd.c
+++ b/drivers/acorn/block/mfmhd.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/arch/arm/drivers/block/mfmhd.c 2 * linux/drivers/acorn/block/mfmhd.c
3 * 3 *
4 * Copyright (C) 1995, 1996 Russell King, Dave Alan Gilbert (gilbertd@cs.man.ac.uk) 4 * Copyright (C) 1995, 1996 Russell King, Dave Alan Gilbert (gilbertd@cs.man.ac.uk)
5 * 5 *
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 56c5ba874623..0f9d4be7ed75 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -253,7 +253,7 @@ config ACPI_CUSTOM_DSDT
253 depends on !STANDALONE 253 depends on !STANDALONE
254 default n 254 default n
255 help 255 help
256 Thist option is to load a custom ACPI DSDT 256 This option is to load a custom ACPI DSDT
257 If you don't know what that is, say N. 257 If you don't know what that is, say N.
258 258
259config ACPI_CUSTOM_DSDT_FILE 259config ACPI_CUSTOM_DSDT_FILE
@@ -310,7 +310,7 @@ config X86_PM_TIMER
310 The Power Management Timer is available on all ACPI-capable, 310 The Power Management Timer is available on all ACPI-capable,
311 in most cases even if ACPI is unusable or blacklisted. 311 in most cases even if ACPI is unusable or blacklisted.
312 312
313 This timing source is not affected by powermanagement features 313 This timing source is not affected by power management features
314 like aggressive processor idling, throttling, frequency and/or 314 like aggressive processor idling, throttling, frequency and/or
315 voltage scaling, unlike the commonly used Time Stamp Counter 315 voltage scaling, unlike the commonly used Time Stamp Counter
316 (TSC) timing source. 316 (TSC) timing source.
@@ -345,7 +345,7 @@ config ACPI_HOTPLUG_MEMORY
345 Enabling this driver assumes that your platform hardware 345 Enabling this driver assumes that your platform hardware
346 and firmware have support for hot-plugging physical memory. If 346 and firmware have support for hot-plugging physical memory. If
347 your system does not support physically adding or ripping out 347 your system does not support physically adding or ripping out
348 memory DIMMs at some platfrom defined granularity (individually 348 memory DIMMs at some platform defined granularity (individually
349 or as a bank) at runtime, then you need not enable this driver. 349 or as a bank) at runtime, then you need not enable this driver.
350 350
351 If one selects "m," this driver can be loaded using the following 351 If one selects "m," this driver can be loaded using the following
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index 422e31d5f8e5..17dc22282e14 100644
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -207,8 +207,7 @@ config BLK_DEV_UMEM
207 module will be called umem. 207 module will be called umem.
208 208
209 The umem driver has not yet been allocated a MAJOR number, so 209 The umem driver has not yet been allocated a MAJOR number, so
210 one is chosen dynamically. Use "devfs" or look in /proc/devices 210 one is chosen dynamically.
211 for the device number
212 211
213config BLK_DEV_UBD 212config BLK_DEV_UBD
214 bool "Virtual block device" 213 bool "Virtual block device"
@@ -407,7 +406,7 @@ config BLK_DEV_RAM_BLOCKSIZE
407 depends on BLK_DEV_RAM 406 depends on BLK_DEV_RAM
408 default "1024" 407 default "1024"
409 help 408 help
410 The default value is 1024 kilobytes. PAGE_SIZE is a much more 409 The default value is 1024 bytes. PAGE_SIZE is a much more
411 efficient choice however. The default is kept to ensure initrd 410 efficient choice however. The default is kept to ensure initrd
412 setups function - apparently needed by the rd_load_image routine 411 setups function - apparently needed by the rd_load_image routine
413 that supposes the filesystem in the image uses a 1024 blocksize. 412 that supposes the filesystem in the image uses a 1024 blocksize.
diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
index b38c84a7a8e3..2a0c50d84fc5 100644
--- a/drivers/cdrom/cdrom.c
+++ b/drivers/cdrom/cdrom.c
@@ -1,4 +1,4 @@
1/* linux/drivers/cdrom/cdrom.c. 1/* linux/drivers/cdrom/cdrom.c
2 Copyright (c) 1996, 1997 David A. van Leeuwen. 2 Copyright (c) 1996, 1997 David A. van Leeuwen.
3 Copyright (c) 1997, 1998 Erik Andersen <andersee@debian.org> 3 Copyright (c) 1997, 1998 Erik Andersen <andersee@debian.org>
4 Copyright (c) 1998, 1999 Jens Axboe <axboe@image.dk> 4 Copyright (c) 1998, 1999 Jens Axboe <axboe@image.dk>
diff --git a/drivers/char/hw_random/ixp4xx-rng.c b/drivers/char/hw_random/ixp4xx-rng.c
index ef71022423c9..3cf4d641a51c 100644
--- a/drivers/char/hw_random/ixp4xx-rng.c
+++ b/drivers/char/hw_random/ixp4xx-rng.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * drivers/char/rng/ixp4xx-rng.c 2 * drivers/char/hw_random/ixp4xx-rng.c
3 * 3 *
4 * RNG driver for Intel IXP4xx family of NPUs 4 * RNG driver for Intel IXP4xx family of NPUs
5 * 5 *
diff --git a/drivers/char/hw_random/omap-rng.c b/drivers/char/hw_random/omap-rng.c
index a01d796d1eeb..e13dd1892bfd 100644
--- a/drivers/char/hw_random/omap-rng.c
+++ b/drivers/char/hw_random/omap-rng.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * driver/char/hw_random/omap-rng.c 2 * drivers/char/hw_random/omap-rng.c
3 * 3 *
4 * RNG driver for TI OMAP CPU family 4 * RNG driver for TI OMAP CPU family
5 * 5 *
diff --git a/drivers/char/mwave/README b/drivers/char/mwave/README
index 70f8d19fb79f..480251fc78e2 100644
--- a/drivers/char/mwave/README
+++ b/drivers/char/mwave/README
@@ -41,10 +41,7 @@ Example to enable the 3780i DSP using ttyS1 resources:
41Accessing the driver 41Accessing the driver
42-------------------- 42--------------------
43 43
44You must also create a node for the driver. Without devfs: 44You must also create a node for the driver:
45 mkdir -p /dev/modems 45 mkdir -p /dev/modems
46 mknod --mode=660 /dev/modems/mwave c 10 219 46 mknod --mode=660 /dev/modems/mwave c 10 219
47With devfs:
48 mkdir -p /dev/modems
49 ln -s ../misc/mwave /dev/modems/mwave
50 47
diff --git a/drivers/char/watchdog/ixp2000_wdt.c b/drivers/char/watchdog/ixp2000_wdt.c
index c91d9a660ec0..fd955dbd588c 100644
--- a/drivers/char/watchdog/ixp2000_wdt.c
+++ b/drivers/char/watchdog/ixp2000_wdt.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * drivers/watchdog/ixp2000_wdt.c 2 * drivers/char/watchdog/ixp2000_wdt.c
3 * 3 *
4 * Watchdog driver for Intel IXP2000 network processors 4 * Watchdog driver for Intel IXP2000 network processors
5 * 5 *
diff --git a/drivers/char/watchdog/ixp4xx_wdt.c b/drivers/char/watchdog/ixp4xx_wdt.c
index db477f712388..5864bb865cfe 100644
--- a/drivers/char/watchdog/ixp4xx_wdt.c
+++ b/drivers/char/watchdog/ixp4xx_wdt.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * drivers/watchdog/ixp4xx_wdt.c 2 * drivers/char/watchdog/ixp4xx_wdt.c
3 * 3 *
4 * Watchdog driver for Intel IXP4xx network processors 4 * Watchdog driver for Intel IXP4xx network processors
5 * 5 *
diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig
index 731c3d5da0dc..88f462122a30 100644
--- a/drivers/firmware/Kconfig
+++ b/drivers/firmware/Kconfig
@@ -64,7 +64,7 @@ config DELL_RBU
64 help 64 help
65 Say m if you want to have the option of updating the BIOS for your 65 Say m if you want to have the option of updating the BIOS for your
66 DELL system. Note you need a Dell OpenManage or Dell Update package (DUP) 66 DELL system. Note you need a Dell OpenManage or Dell Update package (DUP)
67 supporting application to comunicate with the BIOS regarding the new 67 supporting application to communicate with the BIOS regarding the new
68 image for the image update to take effect. 68 image for the image update to take effect.
69 See <file:Documentation/dell_rbu.txt> for more details on the driver. 69 See <file:Documentation/dell_rbu.txt> for more details on the driver.
70 70
diff --git a/drivers/firmware/edd.c b/drivers/firmware/edd.c
index b4502ed65793..5c261e1f92b2 100644
--- a/drivers/firmware/edd.c
+++ b/drivers/firmware/edd.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/arch/i386/kernel/edd.c 2 * linux/drivers/firmware/edd.c
3 * Copyright (C) 2002, 2003, 2004 Dell Inc. 3 * Copyright (C) 2002, 2003, 2004 Dell Inc.
4 * by Matt Domsch <Matt_Domsch@dell.com> 4 * by Matt Domsch <Matt_Domsch@dell.com>
5 * disk signature by Matt Domsch, Andrew Wilks, and Sandeep K. Shandilya 5 * disk signature by Matt Domsch, Andrew Wilks, and Sandeep K. Shandilya
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 0d9667921f61..510816c16da3 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -333,10 +333,10 @@ config I2C_PARPORT_LIGHT
333 333
334 This driver is a light version of i2c-parport. It doesn't depend 334 This driver is a light version of i2c-parport. It doesn't depend
335 on the parport driver, and uses direct I/O access instead. This 335 on the parport driver, and uses direct I/O access instead. This
336 might be prefered on embedded systems where wasting memory for 336 might be preferred on embedded systems where wasting memory for
337 the clean but heavy parport handling is not an option. The 337 the clean but heavy parport handling is not an option. The
338 drawback is a reduced portability and the impossibility to 338 drawback is a reduced portability and the impossibility to
339 dasiy-chain other parallel port devices. 339 daisy-chain other parallel port devices.
340 340
341 Don't say Y here if you said Y or M to i2c-parport. Saying M to 341 Don't say Y here if you said Y or M to i2c-parport. Saying M to
342 both is possible but both modules should not be loaded at the same 342 both is possible but both modules should not be loaded at the same
diff --git a/drivers/i2c/busses/i2c-ibm_iic.c b/drivers/i2c/busses/i2c-ibm_iic.c
index 5bccb5d68318..80d4ba1bdfec 100644
--- a/drivers/i2c/busses/i2c-ibm_iic.c
+++ b/drivers/i2c/busses/i2c-ibm_iic.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * drivers/i2c/i2c-ibm_iic.c 2 * drivers/i2c/busses/i2c-ibm_iic.c
3 * 3 *
4 * Support for the IIC peripheral on IBM PPC 4xx 4 * Support for the IIC peripheral on IBM PPC 4xx
5 * 5 *
diff --git a/drivers/i2c/busses/i2c-ibm_iic.h b/drivers/i2c/busses/i2c-ibm_iic.h
index 2b3219d00e92..59d7b437f7ff 100644
--- a/drivers/i2c/busses/i2c-ibm_iic.h
+++ b/drivers/i2c/busses/i2c-ibm_iic.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * drivers/i2c/i2c-ibm_iic.h 2 * drivers/i2c/busses/i2c-ibm_iic.h
3 * 3 *
4 * Support for the IIC peripheral on IBM PPC 4xx 4 * Support for the IIC peripheral on IBM PPC 4xx
5 * 5 *
diff --git a/drivers/i2c/busses/i2c-ixp4xx.c b/drivers/i2c/busses/i2c-ixp4xx.c
index ab573254a8aa..1ce01fb0ac09 100644
--- a/drivers/i2c/busses/i2c-ixp4xx.c
+++ b/drivers/i2c/busses/i2c-ixp4xx.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * drivers/i2c/i2c-adap-ixp4xx.c 2 * drivers/i2c/busses/i2c-ixp4xx.c
3 * 3 *
4 * Intel's IXP4xx XScale NPU chipsets (IXP420, 421, 422, 425) do not have 4 * Intel's IXP4xx XScale NPU chipsets (IXP420, 421, 422, 425) do not have
5 * an on board I2C controller but provide 16 GPIO pins that are often 5 * an on board I2C controller but provide 16 GPIO pins that are often
diff --git a/drivers/i2c/busses/scx200_i2c.c b/drivers/i2c/busses/scx200_i2c.c
index 8b65a5cf8251..8ddbae4fafe6 100644
--- a/drivers/i2c/busses/scx200_i2c.c
+++ b/drivers/i2c/busses/scx200_i2c.c
@@ -1,4 +1,4 @@
1/* linux/drivers/i2c/scx200_i2c.c 1/* linux/drivers/i2c/busses/scx200_i2c.c
2 2
3 Copyright (c) 2001,2002 Christer Weinigel <wingel@nano-system.com> 3 Copyright (c) 2001,2002 Christer Weinigel <wingel@nano-system.com>
4 4
diff --git a/drivers/ide/h8300/ide-h8300.c b/drivers/ide/h8300/ide-h8300.c
index 15955996a1f3..608ca871744b 100644
--- a/drivers/ide/h8300/ide-h8300.c
+++ b/drivers/ide/h8300/ide-h8300.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * drivers/ide/ide-h8300.c 2 * drivers/ide/h8300/ide-h8300.c
3 * H8/300 generic IDE interface 3 * H8/300 generic IDE interface
4 */ 4 */
5 5
diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c
index 31ad79f52df7..91c5344a945d 100644
--- a/drivers/ide/ppc/pmac.c
+++ b/drivers/ide/ppc/pmac.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/drivers/ide/ide-pmac.c 2 * linux/drivers/ide/ppc/pmac.c
3 * 3 *
4 * Support for IDE interfaces on PowerMacs. 4 * Support for IDE interfaces on PowerMacs.
5 * These IDE interfaces are memory-mapped and have a DBDMA channel 5 * These IDE interfaces are memory-mapped and have a DBDMA channel
diff --git a/drivers/ieee1394/Kconfig b/drivers/ieee1394/Kconfig
index 2769e505f051..672b92ef9f21 100644
--- a/drivers/ieee1394/Kconfig
+++ b/drivers/ieee1394/Kconfig
@@ -140,7 +140,7 @@ config IEEE1394_SBP2_PHYS_DMA
140 help 140 help
141 This builds sbp2 for use with non-OHCI host adapters which do not 141 This builds sbp2 for use with non-OHCI host adapters which do not
142 support physical DMA or for when ohci1394 is run with phys_dma=0. 142 support physical DMA or for when ohci1394 is run with phys_dma=0.
143 Physical DMA is data movement without assistence of the drivers' 143 Physical DMA is data movement without assistance of the drivers'
144 interrupt handlers. This option includes the interrupt handlers 144 interrupt handlers. This option includes the interrupt handlers
145 that are required in absence of this hardware feature. 145 that are required in absence of this hardware feature.
146 146
diff --git a/drivers/infiniband/ulp/ipoib/Kconfig b/drivers/infiniband/ulp/ipoib/Kconfig
index d74653d7de1c..c75322d820d4 100644
--- a/drivers/infiniband/ulp/ipoib/Kconfig
+++ b/drivers/infiniband/ulp/ipoib/Kconfig
@@ -26,7 +26,7 @@ config INFINIBAND_IPOIB_DEBUG_DATA
26 bool "IP-over-InfiniBand data path debugging" 26 bool "IP-over-InfiniBand data path debugging"
27 depends on INFINIBAND_IPOIB_DEBUG 27 depends on INFINIBAND_IPOIB_DEBUG
28 ---help--- 28 ---help---
29 This option compiles debugging code into the the data path 29 This option compiles debugging code into the data path
30 of the IPoIB driver. The output can be turned on via the 30 of the IPoIB driver. The output can be turned on via the
31 data_debug_level module parameter; however, even with output 31 data_debug_level module parameter; however, even with output
32 turned off, this debugging code will have some performance 32 turned off, this debugging code will have some performance
diff --git a/drivers/input/joystick/Kconfig b/drivers/input/joystick/Kconfig
index 67519ef0ef95..271263443c37 100644
--- a/drivers/input/joystick/Kconfig
+++ b/drivers/input/joystick/Kconfig
@@ -32,7 +32,7 @@ config JOYSTICK_ANALOG
32 module will be called analog. 32 module will be called analog.
33 33
34config JOYSTICK_A3D 34config JOYSTICK_A3D
35 tristate "Assasin 3D and MadCatz Panther devices" 35 tristate "Assassin 3D and MadCatz Panther devices"
36 select GAMEPORT 36 select GAMEPORT
37 help 37 help
38 Say Y here if you have an FPGaming or MadCatz controller using the 38 Say Y here if you have an FPGaming or MadCatz controller using the
diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index c62e00c79dec..679bde34d247 100644
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@ -177,7 +177,7 @@ config KEYBOARD_HIL_OLD
177 However, it has been thoroughly tested and is stable. 177 However, it has been thoroughly tested and is stable.
178 178
179 If you want full HIL support including support for multiple 179 If you want full HIL support including support for multiple
180 keyboards, mices and tablets, you have to enable the 180 keyboards, mice, and tablets, you have to enable the
181 "HP System Device Controller i8042 Support" in the input/serio 181 "HP System Device Controller i8042 Support" in the input/serio
182 submenu. 182 submenu.
183 183
diff --git a/drivers/input/serio/Kconfig b/drivers/input/serio/Kconfig
index 98acf170252c..8cdbfeca5903 100644
--- a/drivers/input/serio/Kconfig
+++ b/drivers/input/serio/Kconfig
@@ -115,9 +115,9 @@ config HP_SDC
115 depends on GSC && SERIO 115 depends on GSC && SERIO
116 default y 116 default y
117 ---help--- 117 ---help---
118 This option enables supports for the the "System Device 118 This option enables support for the "System Device
119 Controller", an i8042 carrying microcode to manage a 119 Controller", an i8042 carrying microcode to manage a
120 few miscellanous devices on some Hewlett Packard systems. 120 few miscellaneous devices on some Hewlett Packard systems.
121 The SDC itself contains a 10ms resolution timer/clock capable 121 The SDC itself contains a 10ms resolution timer/clock capable
122 of delivering interrupts on a periodic and one-shot basis. 122 of delivering interrupts on a periodic and one-shot basis.
123 The SDC may also be connected to a battery-backed real-time 123 The SDC may also be connected to a battery-backed real-time
diff --git a/drivers/isdn/hardware/eicon/Kconfig b/drivers/isdn/hardware/eicon/Kconfig
index 51e66bc64208..01d4afd9d843 100644
--- a/drivers/isdn/hardware/eicon/Kconfig
+++ b/drivers/isdn/hardware/eicon/Kconfig
@@ -47,7 +47,7 @@ config ISDN_DIVAS_MAINT
47 tristate "DIVA Maint driver support" 47 tristate "DIVA Maint driver support"
48 depends on ISDN_DIVAS && m 48 depends on ISDN_DIVAS && m
49 help 49 help
50 Enable Divas Maintainance driver. 50 Enable Divas Maintenance driver.
51 51
52endmenu 52endmenu
53 53
diff --git a/drivers/isdn/hisax/Kconfig b/drivers/isdn/hisax/Kconfig
index 6dfc94122dd9..eb57a988e048 100644
--- a/drivers/isdn/hisax/Kconfig
+++ b/drivers/isdn/hisax/Kconfig
@@ -321,7 +321,7 @@ config HISAX_HFC_PCI
321 help 321 help
322 This enables HiSax support for the HFC-S PCI 2BDS0 based cards. 322 This enables HiSax support for the HFC-S PCI 2BDS0 based cards.
323 323
324 For more informations see under 324 For more information see under
325 <file:Documentation/isdn/README.hfc-pci>. 325 <file:Documentation/isdn/README.hfc-pci>.
326 326
327config HISAX_W6692 327config HISAX_W6692
diff --git a/drivers/isdn/hisax/amd7930_fn.h b/drivers/isdn/hisax/amd7930_fn.h
index e039c3a0f2a2..1f4d80c5e5a6 100644
--- a/drivers/isdn/hisax/amd7930_fn.h
+++ b/drivers/isdn/hisax/amd7930_fn.h
@@ -1,4 +1,4 @@
1/* 2001/10/02 1/* drivers/isdn/hisax/amd7930_fn.h
2 * 2 *
3 * gerdes_amd7930.h Header-file included by 3 * gerdes_amd7930.h Header-file included by
4 * gerdes_amd7930.c 4 * gerdes_amd7930.c
diff --git a/drivers/leds/led-class.c b/drivers/leds/led-class.c
index d424b4452028..aecbbe2e89a9 100644
--- a/drivers/leds/led-class.c
+++ b/drivers/leds/led-class.c
@@ -125,7 +125,7 @@ EXPORT_SYMBOL_GPL(led_classdev_register);
125 125
126/** 126/**
127 * led_classdev_unregister - unregisters a object of led_properties class. 127 * led_classdev_unregister - unregisters a object of led_properties class.
128 * @led_cdev: the led device to unreigister 128 * @led_cdev: the led device to unregister
129 * 129 *
130 * Unregisters a previously registered via led_classdev_register object. 130 * Unregisters a previously registered via led_classdev_register object.
131 */ 131 */
diff --git a/drivers/leds/leds-locomo.c b/drivers/leds/leds-locomo.c
index 3b87951aa555..6f2d449ba983 100644
--- a/drivers/leds/leds-locomo.c
+++ b/drivers/leds/leds-locomo.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/drivers/leds/locomo.c 2 * linux/drivers/leds/leds-locomo.c
3 * 3 *
4 * Copyright (C) 2005 John Lenz <lenz@cs.wisc.edu> 4 * Copyright (C) 2005 John Lenz <lenz@cs.wisc.edu>
5 * 5 *
diff --git a/drivers/macintosh/Kconfig b/drivers/macintosh/Kconfig
index d5d649f5ccdb..7f8477d3a661 100644
--- a/drivers/macintosh/Kconfig
+++ b/drivers/macintosh/Kconfig
@@ -186,7 +186,7 @@ config THERM_ADT746X
186 depends on I2C && I2C_POWERMAC && PPC_PMAC && !PPC_PMAC64 186 depends on I2C && I2C_POWERMAC && PPC_PMAC && !PPC_PMAC64
187 help 187 help
188 This driver provides some thermostat and fan control for the 188 This driver provides some thermostat and fan control for the
189 iBook G4, and the ATI based aluminium PowerBooks, allowing slighlty 189 iBook G4, and the ATI based aluminium PowerBooks, allowing slightly
190 better fan behaviour by default, and some manual control. 190 better fan behaviour by default, and some manual control.
191 191
192config THERM_PM72 192config THERM_PM72
diff --git a/drivers/macintosh/adbhid.c b/drivers/macintosh/adbhid.c
index efd51e01c06e..b7fb367808d8 100644
--- a/drivers/macintosh/adbhid.c
+++ b/drivers/macintosh/adbhid.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * drivers/input/adbhid.c 2 * drivers/macintosh/adbhid.c
3 * 3 *
4 * ADB HID driver for Power Macintosh computers. 4 * ADB HID driver for Power Macintosh computers.
5 * 5 *
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 38a0a5741d52..cb8281605be8 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -4438,8 +4438,7 @@ static int md_release(struct inode *inode, struct file * file)
4438{ 4438{
4439 mddev_t *mddev = inode->i_bdev->bd_disk->private_data; 4439 mddev_t *mddev = inode->i_bdev->bd_disk->private_data;
4440 4440
4441 if (!mddev) 4441 BUG_ON(!mddev);
4442 BUG();
4443 mddev_put(mddev); 4442 mddev_put(mddev);
4444 4443
4445 return 0; 4444 return 0;
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 37e4ff661b6c..e14f45780720 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -1105,7 +1105,7 @@ static void compute_parity6(struct stripe_head *sh, int method)
1105 if (test_and_clear_bit(R5_Overlap, &sh->dev[i].flags)) 1105 if (test_and_clear_bit(R5_Overlap, &sh->dev[i].flags))
1106 wake_up(&conf->wait_for_overlap); 1106 wake_up(&conf->wait_for_overlap);
1107 1107
1108 if (sh->dev[i].written) BUG(); 1108 BUG_ON(sh->dev[i].written);
1109 sh->dev[i].written = chosen; 1109 sh->dev[i].written = chosen;
1110 } 1110 }
1111 break; 1111 break;
diff --git a/drivers/media/dvb/cinergyT2/Kconfig b/drivers/media/dvb/cinergyT2/Kconfig
index b5cdd57ec6f5..3d778c5aba68 100644
--- a/drivers/media/dvb/cinergyT2/Kconfig
+++ b/drivers/media/dvb/cinergyT2/Kconfig
@@ -56,7 +56,7 @@ config DVB_CINERGYT2_QUERY_INTERVAL
56 measurements. 56 measurements.
57 57
58 Please keep in mind that these updates cause traffic on the tuner 58 Please keep in mind that these updates cause traffic on the tuner
59 control bus and thus may or may not affect receiption sensitivity. 59 control bus and thus may or may not affect reception sensitivity.
60 60
61 The default value should be a safe choice for common applications. 61 The default value should be a safe choice for common applications.
62 62
diff --git a/drivers/media/radio/Kconfig b/drivers/media/radio/Kconfig
index 7015517e2c1b..6d96b17a7f81 100644
--- a/drivers/media/radio/Kconfig
+++ b/drivers/media/radio/Kconfig
@@ -195,8 +195,7 @@ config RADIO_MIROPCM20_RDS
195 ---help--- 195 ---help---
196 Choose Y here if you want to see RDS/RBDS information like 196 Choose Y here if you want to see RDS/RBDS information like
197 RadioText, Programme Service name, Clock Time and date, Programme 197 RadioText, Programme Service name, Clock Time and date, Programme
198 TYpe and Traffic Announcement/Programme identification. You also 198 Type and Traffic Announcement/Programme identification.
199 need to say Y to "miroSOUND PCM20 radio" and devfs!
200 199
201 It's not possible to read the raw RDS packets from the device, so 200 It's not possible to read the raw RDS packets from the device, so
202 the driver cant provide an V4L interface for this. But the 201 the driver cant provide an V4L interface for this. But the
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index 5c53fe62d38b..afb734df6e05 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -353,7 +353,7 @@ config VIDEO_SAA6588
353 help 353 help
354 Support for Radio Data System (RDS) decoder. This allows seeing 354 Support for Radio Data System (RDS) decoder. This allows seeing
355 radio station identification transmitted using this standard. 355 radio station identification transmitted using this standard.
356 Currentlly, it works only with bt8x8 chips. 356 Currently, it works only with bt8x8 chips.
357 357
358 To compile this driver as a module, choose M here: the 358 To compile this driver as a module, choose M here: the
359 module will be called saa6588. 359 module will be called saa6588.
diff --git a/drivers/media/video/cx88/Kconfig b/drivers/media/video/cx88/Kconfig
index 51d68f32aa06..0f9d96963618 100644
--- a/drivers/media/video/cx88/Kconfig
+++ b/drivers/media/video/cx88/Kconfig
@@ -69,6 +69,6 @@ config VIDEO_CX88_VP3054
69 depends on VIDEO_CX88_DVB && DVB_MT352 69 depends on VIDEO_CX88_DVB && DVB_MT352
70 ---help--- 70 ---help---
71 This adds DVB-T support for cards based on the 71 This adds DVB-T support for cards based on the
72 Connexant 2388x chip and the MT352 demodulator, 72 Conexant 2388x chip and the MT352 demodulator,
73 which also require support for the VP-3054 73 which also require support for the VP-3054
74 Secondary I2C bus, such at DNTV Live! DVB-T Pro. 74 Secondary I2C bus, such at DNTV Live! DVB-T Pro.
diff --git a/drivers/media/video/pwc/philips.txt b/drivers/media/video/pwc/philips.txt
index 11f751a6bda5..f5e848410311 100644
--- a/drivers/media/video/pwc/philips.txt
+++ b/drivers/media/video/pwc/philips.txt
@@ -175,8 +175,8 @@ dev_hint
175 - If a device node is already occupied, registration will fail and 175 - If a device node is already occupied, registration will fail and
176 the webcam is not available. 176 the webcam is not available.
177 - You can have up to 64 video devices; be sure to make enough device 177 - You can have up to 64 video devices; be sure to make enough device
178 nodes in /dev if you want to spread the numbers (this does not apply 178 nodes in /dev if you want to spread the numbers.
179 to devfs). After /dev/video9 comes /dev/video10 (not /dev/videoA). 179 After /dev/video9 comes /dev/video10 (not /dev/videoA).
180 - If a camera does not match any dev_hint, it will simply get assigned 180 - If a camera does not match any dev_hint, it will simply get assigned
181 the first available device node, just as it used to be. 181 the first available device node, just as it used to be.
182 182
diff --git a/drivers/mtd/chips/Kconfig b/drivers/mtd/chips/Kconfig
index 6d8f30deb868..72e6d73beb40 100644
--- a/drivers/mtd/chips/Kconfig
+++ b/drivers/mtd/chips/Kconfig
@@ -270,7 +270,7 @@ config MTD_JEDEC
270 tristate "JEDEC device support" 270 tristate "JEDEC device support"
271 depends on MTD && MTD_OBSOLETE_CHIPS && BROKEN 271 depends on MTD && MTD_OBSOLETE_CHIPS && BROKEN
272 help 272 help
273 Enable older older JEDEC flash interface devices for self 273 Enable older JEDEC flash interface devices for self
274 programming flash. It is commonly used in older AMD chips. It is 274 programming flash. It is commonly used in older AMD chips. It is
275 only called JEDEC because the JEDEC association 275 only called JEDEC because the JEDEC association
276 <http://www.jedec.org/> distributes the identification codes for the 276 <http://www.jedec.org/> distributes the identification codes for the
diff --git a/drivers/mtd/maps/bast-flash.c b/drivers/mtd/maps/bast-flash.c
index 51f962dd7e31..e074bb6787d2 100644
--- a/drivers/mtd/maps/bast-flash.c
+++ b/drivers/mtd/maps/bast-flash.c
@@ -1,4 +1,4 @@
1/* linux/drivers/mtd/maps/bast_flash.c 1/* linux/drivers/mtd/maps/bast-flash.c
2 * 2 *
3 * Copyright (c) 2004-2005 Simtec Electronics 3 * Copyright (c) 2004-2005 Simtec Electronics
4 * Ben Dooks <ben@simtec.co.uk> 4 * Ben Dooks <ben@simtec.co.uk>
diff --git a/drivers/mtd/maps/dmv182.c b/drivers/mtd/maps/dmv182.c
index a43c49905cac..e0558b0b2fe6 100644
--- a/drivers/mtd/maps/dmv182.c
+++ b/drivers/mtd/maps/dmv182.c
@@ -1,6 +1,6 @@
1 1
2/* 2/*
3 * drivers/mtd/maps/svme182.c 3 * drivers/mtd/maps/dmv182.c
4 * 4 *
5 * Flash map driver for the Dy4 SVME182 board 5 * Flash map driver for the Dy4 SVME182 board
6 * 6 *
diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index c99302ed3823..1831340e5f51 100644
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -21,7 +21,7 @@ config MTD_NAND_VERIFY_WRITE
21 NAND flash device internally checks only bits transitioning 21 NAND flash device internally checks only bits transitioning
22 from 1 to 0. There is a rare possibility that even though the 22 from 1 to 0. There is a rare possibility that even though the
23 device thinks the write was successful, a bit could have been 23 device thinks the write was successful, a bit could have been
24 flipped accidentaly due to device wear or something else. 24 flipped accidentally due to device wear or something else.
25 25
26config MTD_NAND_ECC_SMC 26config MTD_NAND_ECC_SMC
27 bool "NAND ECC Smart Media byte order" 27 bool "NAND ECC Smart Media byte order"
diff --git a/drivers/mtd/onenand/Kconfig b/drivers/mtd/onenand/Kconfig
index 465961b8bcd1..373bddce8f1c 100644
--- a/drivers/mtd/onenand/Kconfig
+++ b/drivers/mtd/onenand/Kconfig
@@ -21,7 +21,7 @@ config MTD_ONENAND_VERIFY_WRITE
21 OneNAND flash device internally checks only bits transitioning 21 OneNAND flash device internally checks only bits transitioning
22 from 1 to 0. There is a rare possibility that even though the 22 from 1 to 0. There is a rare possibility that even though the
23 device thinks the write was successful, a bit could have been 23 device thinks the write was successful, a bit could have been
24 flipped accidentaly due to device wear or something else. 24 flipped accidentally due to device wear or something else.
25 25
26config MTD_ONENAND_GENERIC 26config MTD_ONENAND_GENERIC
27 tristate "OneNAND Flash device via platform device driver" 27 tristate "OneNAND Flash device via platform device driver"
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index ff8a8c0a26d5..ab92cc794c64 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -2115,7 +2115,7 @@ config SKY2
2115 depends on PCI && EXPERIMENTAL 2115 depends on PCI && EXPERIMENTAL
2116 select CRC32 2116 select CRC32
2117 ---help--- 2117 ---help---
2118 This driver supports Gigabit Ethernet adapters based on the the 2118 This driver supports Gigabit Ethernet adapters based on the
2119 Marvell Yukon 2 chipset: 2119 Marvell Yukon 2 chipset:
2120 Marvell 88E8021/88E8022/88E8035/88E8036/88E8038/88E8050/88E8052/ 2120 Marvell 88E8021/88E8022/88E8035/88E8036/88E8038/88E8050/88E8052/
2121 88E8053/88E8055/88E8061/88E8062, SysKonnect SK-9E21D/SK-9S21 2121 88E8053/88E8055/88E8061/88E8062, SysKonnect SK-9E21D/SK-9S21
diff --git a/drivers/net/arm/am79c961a.h b/drivers/net/arm/am79c961a.h
index 6a49ac7f6d46..483009fe6ec2 100644
--- a/drivers/net/arm/am79c961a.h
+++ b/drivers/net/arm/am79c961a.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/drivers/net/am79c961.h 2 * linux/drivers/net/arm/am79c961a.h
3 * 3 *
4 * This program is free software; you can redistribute it and/or modify 4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License version 2 as 5 * it under the terms of the GNU General Public License version 2 as
diff --git a/drivers/net/ibm_emac/ibm_emac_debug.h b/drivers/net/ibm_emac/ibm_emac_debug.h
index 5761389495d0..6c7dccc84bf5 100644
--- a/drivers/net/ibm_emac/ibm_emac_debug.h
+++ b/drivers/net/ibm_emac/ibm_emac_debug.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * drivers/net/ibm_emac/ibm_ocp_debug.h 2 * drivers/net/ibm_emac/ibm_emac_debug.h
3 * 3 *
4 * Driver for PowerPC 4xx on-chip ethernet controller, debug print routines. 4 * Driver for PowerPC 4xx on-chip ethernet controller, debug print routines.
5 * 5 *
diff --git a/drivers/net/ibm_emac/ibm_emac_rgmii.h b/drivers/net/ibm_emac/ibm_emac_rgmii.h
index 94abde55e2e9..117ea486c2ca 100644
--- a/drivers/net/ibm_emac/ibm_emac_rgmii.h
+++ b/drivers/net/ibm_emac/ibm_emac_rgmii.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * drivers/net/ibm_emac/ibm_emac_rgmii.c 2 * drivers/net/ibm_emac/ibm_emac_rgmii.h
3 * 3 *
4 * Driver for PowerPC 4xx on-chip ethernet controller, RGMII bridge support. 4 * Driver for PowerPC 4xx on-chip ethernet controller, RGMII bridge support.
5 * 5 *
diff --git a/drivers/net/tokenring/tmspci.c b/drivers/net/tokenring/tmspci.c
index 7d3e270c4f45..3b2f00b9b7bd 100644
--- a/drivers/net/tokenring/tmspci.c
+++ b/drivers/net/tokenring/tmspci.c
@@ -224,8 +224,7 @@ static void __devexit tms_pci_detach (struct pci_dev *pdev)
224{ 224{
225 struct net_device *dev = pci_get_drvdata(pdev); 225 struct net_device *dev = pci_get_drvdata(pdev);
226 226
227 if (!dev) 227 BUG_ON(!dev);
228 BUG();
229 unregister_netdev(dev); 228 unregister_netdev(dev);
230 release_region(dev->base_addr, TMS_PCI_IO_EXTENT); 229 release_region(dev->base_addr, TMS_PCI_IO_EXTENT);
231 free_irq(dev->irq, dev); 230 free_irq(dev->irq, dev);
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index bd4a68c85a47..ece3d9c2dc61 100644
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -301,7 +301,7 @@ config HERMES
301 tristate "Hermes chipset 802.11b support (Orinoco/Prism2/Symbol)" 301 tristate "Hermes chipset 802.11b support (Orinoco/Prism2/Symbol)"
302 depends on NET_RADIO && (PPC_PMAC || PCI || PCMCIA) 302 depends on NET_RADIO && (PPC_PMAC || PCI || PCMCIA)
303 ---help--- 303 ---help---
304 A driver for 802.11b wireless cards based based on the "Hermes" or 304 A driver for 802.11b wireless cards based on the "Hermes" or
305 Intersil HFA384x (Prism 2) MAC controller. This includes the vast 305 Intersil HFA384x (Prism 2) MAC controller. This includes the vast
306 majority of the PCMCIA 802.11b cards (which are nearly all rebadges) 306 majority of the PCMCIA 802.11b cards (which are nearly all rebadges)
307 - except for the Cisco/Aironet cards. Cards supported include the 307 - except for the Cisco/Aironet cards. Cards supported include the
diff --git a/drivers/parisc/power.c b/drivers/parisc/power.c
index 4a9f025a6b58..2eb3577a88c5 100644
--- a/drivers/parisc/power.c
+++ b/drivers/parisc/power.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/arch/parisc/kernel/power.c 2 * linux/drivers/parisc/power.c
3 * HP PARISC soft power switch support driver 3 * HP PARISC soft power switch support driver
4 * 4 *
5 * Copyright (c) 2001-2005 Helge Deller <deller@gmx.de> 5 * Copyright (c) 2001-2005 Helge Deller <deller@gmx.de>
diff --git a/drivers/parport/daisy.c b/drivers/parport/daisy.c
index fd41e28101ea..83ee095ec6e2 100644
--- a/drivers/parport/daisy.c
+++ b/drivers/parport/daisy.c
@@ -30,7 +30,7 @@
30#undef DEBUG 30#undef DEBUG
31 31
32#ifdef DEBUG 32#ifdef DEBUG
33#define DPRINTK(stuff...) printk (stuff) 33#define DPRINTK(stuff...) printk(stuff)
34#else 34#else
35#define DPRINTK(stuff...) 35#define DPRINTK(stuff...)
36#endif 36#endif
@@ -46,16 +46,16 @@ static DEFINE_SPINLOCK(topology_lock);
46static int numdevs = 0; 46static int numdevs = 0;
47 47
48/* Forward-declaration of lower-level functions. */ 48/* Forward-declaration of lower-level functions. */
49static int mux_present (struct parport *port); 49static int mux_present(struct parport *port);
50static int num_mux_ports (struct parport *port); 50static int num_mux_ports(struct parport *port);
51static int select_port (struct parport *port); 51static int select_port(struct parport *port);
52static int assign_addrs (struct parport *port); 52static int assign_addrs(struct parport *port);
53 53
54/* Add a device to the discovered topology. */ 54/* Add a device to the discovered topology. */
55static void add_dev (int devnum, struct parport *port, int daisy) 55static void add_dev(int devnum, struct parport *port, int daisy)
56{ 56{
57 struct daisydev *newdev, **p; 57 struct daisydev *newdev, **p;
58 newdev = kmalloc (sizeof (struct daisydev), GFP_KERNEL); 58 newdev = kmalloc(sizeof(struct daisydev), GFP_KERNEL);
59 if (newdev) { 59 if (newdev) {
60 newdev->port = port; 60 newdev->port = port;
61 newdev->daisy = daisy; 61 newdev->daisy = daisy;
@@ -70,9 +70,9 @@ static void add_dev (int devnum, struct parport *port, int daisy)
70} 70}
71 71
72/* Clone a parport (actually, make an alias). */ 72/* Clone a parport (actually, make an alias). */
73static struct parport *clone_parport (struct parport *real, int muxport) 73static struct parport *clone_parport(struct parport *real, int muxport)
74{ 74{
75 struct parport *extra = parport_register_port (real->base, 75 struct parport *extra = parport_register_port(real->base,
76 real->irq, 76 real->irq,
77 real->dma, 77 real->dma,
78 real->ops); 78 real->ops);
@@ -88,7 +88,7 @@ static struct parport *clone_parport (struct parport *real, int muxport)
88 88
89/* Discover the IEEE1284.3 topology on a port -- muxes and daisy chains. 89/* Discover the IEEE1284.3 topology on a port -- muxes and daisy chains.
90 * Return value is number of devices actually detected. */ 90 * Return value is number of devices actually detected. */
91int parport_daisy_init (struct parport *port) 91int parport_daisy_init(struct parport *port)
92{ 92{
93 int detected = 0; 93 int detected = 0;
94 char *deviceid; 94 char *deviceid;
@@ -103,26 +103,26 @@ again:
103 103
104 /* If mux present on normal port, need to create new 104 /* If mux present on normal port, need to create new
105 * parports for each extra port. */ 105 * parports for each extra port. */
106 if (port->muxport < 0 && mux_present (port) && 106 if (port->muxport < 0 && mux_present(port) &&
107 /* don't be fooled: a mux must have 2 or 4 ports. */ 107 /* don't be fooled: a mux must have 2 or 4 ports. */
108 ((num_ports = num_mux_ports (port)) == 2 || num_ports == 4)) { 108 ((num_ports = num_mux_ports(port)) == 2 || num_ports == 4)) {
109 /* Leave original as port zero. */ 109 /* Leave original as port zero. */
110 port->muxport = 0; 110 port->muxport = 0;
111 printk (KERN_INFO 111 printk(KERN_INFO
112 "%s: 1st (default) port of %d-way multiplexor\n", 112 "%s: 1st (default) port of %d-way multiplexor\n",
113 port->name, num_ports); 113 port->name, num_ports);
114 for (i = 1; i < num_ports; i++) { 114 for (i = 1; i < num_ports; i++) {
115 /* Clone the port. */ 115 /* Clone the port. */
116 struct parport *extra = clone_parport (port, i); 116 struct parport *extra = clone_parport(port, i);
117 if (!extra) { 117 if (!extra) {
118 if (signal_pending (current)) 118 if (signal_pending(current))
119 break; 119 break;
120 120
121 schedule (); 121 schedule();
122 continue; 122 continue;
123 } 123 }
124 124
125 printk (KERN_INFO 125 printk(KERN_INFO
126 "%s: %d%s port of %d-way multiplexor on %s\n", 126 "%s: %d%s port of %d-way multiplexor on %s\n",
127 extra->name, i + 1, th[i + 1], num_ports, 127 extra->name, i + 1, th[i + 1], num_ports,
128 port->name); 128 port->name);
@@ -135,34 +135,34 @@ again:
135 } 135 }
136 136
137 if (port->muxport >= 0) 137 if (port->muxport >= 0)
138 select_port (port); 138 select_port(port);
139 139
140 parport_daisy_deselect_all (port); 140 parport_daisy_deselect_all(port);
141 detected += assign_addrs (port); 141 detected += assign_addrs(port);
142 142
143 /* Count the potential legacy device at the end. */ 143 /* Count the potential legacy device at the end. */
144 add_dev (numdevs++, port, -1); 144 add_dev(numdevs++, port, -1);
145 145
146 /* Find out the legacy device's IEEE 1284 device ID. */ 146 /* Find out the legacy device's IEEE 1284 device ID. */
147 deviceid = kmalloc (1024, GFP_KERNEL); 147 deviceid = kmalloc(1024, GFP_KERNEL);
148 if (deviceid) { 148 if (deviceid) {
149 if (parport_device_id (numdevs - 1, deviceid, 1024) > 2) 149 if (parport_device_id(numdevs - 1, deviceid, 1024) > 2)
150 detected++; 150 detected++;
151 151
152 kfree (deviceid); 152 kfree(deviceid);
153 } 153 }
154 154
155 if (!detected && !last_try) { 155 if (!detected && !last_try) {
156 /* No devices were detected. Perhaps they are in some 156 /* No devices were detected. Perhaps they are in some
157 funny state; let's try to reset them and see if 157 funny state; let's try to reset them and see if
158 they wake up. */ 158 they wake up. */
159 parport_daisy_fini (port); 159 parport_daisy_fini(port);
160 parport_write_control (port, PARPORT_CONTROL_SELECT); 160 parport_write_control(port, PARPORT_CONTROL_SELECT);
161 udelay (50); 161 udelay(50);
162 parport_write_control (port, 162 parport_write_control(port,
163 PARPORT_CONTROL_SELECT | 163 PARPORT_CONTROL_SELECT |
164 PARPORT_CONTROL_INIT); 164 PARPORT_CONTROL_INIT);
165 udelay (50); 165 udelay(50);
166 last_try = 1; 166 last_try = 1;
167 goto again; 167 goto again;
168 } 168 }
@@ -171,7 +171,7 @@ again:
171} 171}
172 172
173/* Forget about devices on a physical port. */ 173/* Forget about devices on a physical port. */
174void parport_daisy_fini (struct parport *port) 174void parport_daisy_fini(struct parport *port)
175{ 175{
176 struct daisydev **p; 176 struct daisydev **p;
177 177
@@ -214,7 +214,7 @@ void parport_daisy_fini (struct parport *port)
214 * for parport_register_device(). 214 * for parport_register_device().
215 **/ 215 **/
216 216
217struct pardevice *parport_open (int devnum, const char *name, 217struct pardevice *parport_open(int devnum, const char *name,
218 int (*pf) (void *), void (*kf) (void *), 218 int (*pf) (void *), void (*kf) (void *),
219 void (*irqf) (int, void *, struct pt_regs *), 219 void (*irqf) (int, void *, struct pt_regs *),
220 int flags, void *handle) 220 int flags, void *handle)
@@ -237,7 +237,7 @@ struct pardevice *parport_open (int devnum, const char *name,
237 port = parport_get_port(p->port); 237 port = parport_get_port(p->port);
238 spin_unlock(&topology_lock); 238 spin_unlock(&topology_lock);
239 239
240 dev = parport_register_device (port, name, pf, kf, 240 dev = parport_register_device(port, name, pf, kf,
241 irqf, flags, handle); 241 irqf, flags, handle);
242 parport_put_port(port); 242 parport_put_port(port);
243 if (!dev) 243 if (!dev)
@@ -248,13 +248,13 @@ struct pardevice *parport_open (int devnum, const char *name,
248 /* Check that there really is a device to select. */ 248 /* Check that there really is a device to select. */
249 if (daisy >= 0) { 249 if (daisy >= 0) {
250 int selected; 250 int selected;
251 parport_claim_or_block (dev); 251 parport_claim_or_block(dev);
252 selected = port->daisy; 252 selected = port->daisy;
253 parport_release (dev); 253 parport_release(dev);
254 254
255 if (selected != daisy) { 255 if (selected != daisy) {
256 /* No corresponding device. */ 256 /* No corresponding device. */
257 parport_unregister_device (dev); 257 parport_unregister_device(dev);
258 return NULL; 258 return NULL;
259 } 259 }
260 } 260 }
@@ -270,9 +270,9 @@ struct pardevice *parport_open (int devnum, const char *name,
270 * parport_register_device(). 270 * parport_register_device().
271 **/ 271 **/
272 272
273void parport_close (struct pardevice *dev) 273void parport_close(struct pardevice *dev)
274{ 274{
275 parport_unregister_device (dev); 275 parport_unregister_device(dev);
276} 276}
277 277
278/** 278/**
@@ -287,7 +287,7 @@ void parport_close (struct pardevice *dev)
287 * exists. 287 * exists.
288 **/ 288 **/
289 289
290int parport_device_num (int parport, int mux, int daisy) 290int parport_device_num(int parport, int mux, int daisy)
291{ 291{
292 int res = -ENXIO; 292 int res = -ENXIO;
293 struct daisydev *dev; 293 struct daisydev *dev;
@@ -305,16 +305,16 @@ int parport_device_num (int parport, int mux, int daisy)
305} 305}
306 306
307/* Send a daisy-chain-style CPP command packet. */ 307/* Send a daisy-chain-style CPP command packet. */
308static int cpp_daisy (struct parport *port, int cmd) 308static int cpp_daisy(struct parport *port, int cmd)
309{ 309{
310 unsigned char s; 310 unsigned char s;
311 311
312 parport_data_forward (port); 312 parport_data_forward(port);
313 parport_write_data (port, 0xaa); udelay (2); 313 parport_write_data(port, 0xaa); udelay(2);
314 parport_write_data (port, 0x55); udelay (2); 314 parport_write_data(port, 0x55); udelay(2);
315 parport_write_data (port, 0x00); udelay (2); 315 parport_write_data(port, 0x00); udelay(2);
316 parport_write_data (port, 0xff); udelay (2); 316 parport_write_data(port, 0xff); udelay(2);
317 s = parport_read_status (port) & (PARPORT_STATUS_BUSY 317 s = parport_read_status(port) & (PARPORT_STATUS_BUSY
318 | PARPORT_STATUS_PAPEROUT 318 | PARPORT_STATUS_PAPEROUT
319 | PARPORT_STATUS_SELECT 319 | PARPORT_STATUS_SELECT
320 | PARPORT_STATUS_ERROR); 320 | PARPORT_STATUS_ERROR);
@@ -322,54 +322,54 @@ static int cpp_daisy (struct parport *port, int cmd)
322 | PARPORT_STATUS_PAPEROUT 322 | PARPORT_STATUS_PAPEROUT
323 | PARPORT_STATUS_SELECT 323 | PARPORT_STATUS_SELECT
324 | PARPORT_STATUS_ERROR)) { 324 | PARPORT_STATUS_ERROR)) {
325 DPRINTK (KERN_DEBUG "%s: cpp_daisy: aa5500ff(%02x)\n", 325 DPRINTK(KERN_DEBUG "%s: cpp_daisy: aa5500ff(%02x)\n",
326 port->name, s); 326 port->name, s);
327 return -ENXIO; 327 return -ENXIO;
328 } 328 }
329 329
330 parport_write_data (port, 0x87); udelay (2); 330 parport_write_data(port, 0x87); udelay(2);
331 s = parport_read_status (port) & (PARPORT_STATUS_BUSY 331 s = parport_read_status(port) & (PARPORT_STATUS_BUSY
332 | PARPORT_STATUS_PAPEROUT 332 | PARPORT_STATUS_PAPEROUT
333 | PARPORT_STATUS_SELECT 333 | PARPORT_STATUS_SELECT
334 | PARPORT_STATUS_ERROR); 334 | PARPORT_STATUS_ERROR);
335 if (s != (PARPORT_STATUS_SELECT | PARPORT_STATUS_ERROR)) { 335 if (s != (PARPORT_STATUS_SELECT | PARPORT_STATUS_ERROR)) {
336 DPRINTK (KERN_DEBUG "%s: cpp_daisy: aa5500ff87(%02x)\n", 336 DPRINTK(KERN_DEBUG "%s: cpp_daisy: aa5500ff87(%02x)\n",
337 port->name, s); 337 port->name, s);
338 return -ENXIO; 338 return -ENXIO;
339 } 339 }
340 340
341 parport_write_data (port, 0x78); udelay (2); 341 parport_write_data(port, 0x78); udelay(2);
342 parport_write_data (port, cmd); udelay (2); 342 parport_write_data(port, cmd); udelay(2);
343 parport_frob_control (port, 343 parport_frob_control(port,
344 PARPORT_CONTROL_STROBE, 344 PARPORT_CONTROL_STROBE,
345 PARPORT_CONTROL_STROBE); 345 PARPORT_CONTROL_STROBE);
346 udelay (1); 346 udelay(1);
347 s = parport_read_status (port); 347 s = parport_read_status(port);
348 parport_frob_control (port, PARPORT_CONTROL_STROBE, 0); 348 parport_frob_control(port, PARPORT_CONTROL_STROBE, 0);
349 udelay (1); 349 udelay(1);
350 parport_write_data (port, 0xff); udelay (2); 350 parport_write_data(port, 0xff); udelay(2);
351 351
352 return s; 352 return s;
353} 353}
354 354
355/* Send a mux-style CPP command packet. */ 355/* Send a mux-style CPP command packet. */
356static int cpp_mux (struct parport *port, int cmd) 356static int cpp_mux(struct parport *port, int cmd)
357{ 357{
358 unsigned char s; 358 unsigned char s;
359 int rc; 359 int rc;
360 360
361 parport_data_forward (port); 361 parport_data_forward(port);
362 parport_write_data (port, 0xaa); udelay (2); 362 parport_write_data(port, 0xaa); udelay(2);
363 parport_write_data (port, 0x55); udelay (2); 363 parport_write_data(port, 0x55); udelay(2);
364 parport_write_data (port, 0xf0); udelay (2); 364 parport_write_data(port, 0xf0); udelay(2);
365 parport_write_data (port, 0x0f); udelay (2); 365 parport_write_data(port, 0x0f); udelay(2);
366 parport_write_data (port, 0x52); udelay (2); 366 parport_write_data(port, 0x52); udelay(2);
367 parport_write_data (port, 0xad); udelay (2); 367 parport_write_data(port, 0xad); udelay(2);
368 parport_write_data (port, cmd); udelay (2); 368 parport_write_data(port, cmd); udelay(2);
369 369
370 s = parport_read_status (port); 370 s = parport_read_status(port);
371 if (!(s & PARPORT_STATUS_ACK)) { 371 if (!(s & PARPORT_STATUS_ACK)) {
372 DPRINTK (KERN_DEBUG "%s: cpp_mux: aa55f00f52ad%02x(%02x)\n", 372 DPRINTK(KERN_DEBUG "%s: cpp_mux: aa55f00f52ad%02x(%02x)\n",
373 port->name, cmd, s); 373 port->name, cmd, s);
374 return -EIO; 374 return -EIO;
375 } 375 }
@@ -382,12 +382,12 @@ static int cpp_mux (struct parport *port, int cmd)
382 return rc; 382 return rc;
383} 383}
384 384
385void parport_daisy_deselect_all (struct parport *port) 385void parport_daisy_deselect_all(struct parport *port)
386{ 386{
387 cpp_daisy (port, 0x30); 387 cpp_daisy(port, 0x30);
388} 388}
389 389
390int parport_daisy_select (struct parport *port, int daisy, int mode) 390int parport_daisy_select(struct parport *port, int daisy, int mode)
391{ 391{
392 switch (mode) 392 switch (mode)
393 { 393 {
@@ -395,14 +395,14 @@ int parport_daisy_select (struct parport *port, int daisy, int mode)
395 case IEEE1284_MODE_EPP: 395 case IEEE1284_MODE_EPP:
396 case IEEE1284_MODE_EPPSL: 396 case IEEE1284_MODE_EPPSL:
397 case IEEE1284_MODE_EPPSWE: 397 case IEEE1284_MODE_EPPSWE:
398 return !(cpp_daisy (port, 0x20 + daisy) & 398 return !(cpp_daisy(port, 0x20 + daisy) &
399 PARPORT_STATUS_ERROR); 399 PARPORT_STATUS_ERROR);
400 400
401 // For these modes we should switch to ECP mode: 401 // For these modes we should switch to ECP mode:
402 case IEEE1284_MODE_ECP: 402 case IEEE1284_MODE_ECP:
403 case IEEE1284_MODE_ECPRLE: 403 case IEEE1284_MODE_ECPRLE:
404 case IEEE1284_MODE_ECPSWE: 404 case IEEE1284_MODE_ECPSWE:
405 return !(cpp_daisy (port, 0xd0 + daisy) & 405 return !(cpp_daisy(port, 0xd0 + daisy) &
406 PARPORT_STATUS_ERROR); 406 PARPORT_STATUS_ERROR);
407 407
408 // Nothing was told for BECP in Daisy chain specification. 408 // Nothing was told for BECP in Daisy chain specification.
@@ -413,28 +413,28 @@ int parport_daisy_select (struct parport *port, int daisy, int mode)
413 case IEEE1284_MODE_BYTE: 413 case IEEE1284_MODE_BYTE:
414 case IEEE1284_MODE_COMPAT: 414 case IEEE1284_MODE_COMPAT:
415 default: 415 default:
416 return !(cpp_daisy (port, 0xe0 + daisy) & 416 return !(cpp_daisy(port, 0xe0 + daisy) &
417 PARPORT_STATUS_ERROR); 417 PARPORT_STATUS_ERROR);
418 } 418 }
419} 419}
420 420
421static int mux_present (struct parport *port) 421static int mux_present(struct parport *port)
422{ 422{
423 return cpp_mux (port, 0x51) == 3; 423 return cpp_mux(port, 0x51) == 3;
424} 424}
425 425
426static int num_mux_ports (struct parport *port) 426static int num_mux_ports(struct parport *port)
427{ 427{
428 return cpp_mux (port, 0x58); 428 return cpp_mux(port, 0x58);
429} 429}
430 430
431static int select_port (struct parport *port) 431static int select_port(struct parport *port)
432{ 432{
433 int muxport = port->muxport; 433 int muxport = port->muxport;
434 return cpp_mux (port, 0x60 + muxport) == muxport; 434 return cpp_mux(port, 0x60 + muxport) == muxport;
435} 435}
436 436
437static int assign_addrs (struct parport *port) 437static int assign_addrs(struct parport *port)
438{ 438{
439 unsigned char s; 439 unsigned char s;
440 unsigned char daisy; 440 unsigned char daisy;
@@ -442,12 +442,12 @@ static int assign_addrs (struct parport *port)
442 int detected; 442 int detected;
443 char *deviceid; 443 char *deviceid;
444 444
445 parport_data_forward (port); 445 parport_data_forward(port);
446 parport_write_data (port, 0xaa); udelay (2); 446 parport_write_data(port, 0xaa); udelay(2);
447 parport_write_data (port, 0x55); udelay (2); 447 parport_write_data(port, 0x55); udelay(2);
448 parport_write_data (port, 0x00); udelay (2); 448 parport_write_data(port, 0x00); udelay(2);
449 parport_write_data (port, 0xff); udelay (2); 449 parport_write_data(port, 0xff); udelay(2);
450 s = parport_read_status (port) & (PARPORT_STATUS_BUSY 450 s = parport_read_status(port) & (PARPORT_STATUS_BUSY
451 | PARPORT_STATUS_PAPEROUT 451 | PARPORT_STATUS_PAPEROUT
452 | PARPORT_STATUS_SELECT 452 | PARPORT_STATUS_SELECT
453 | PARPORT_STATUS_ERROR); 453 | PARPORT_STATUS_ERROR);
@@ -455,40 +455,40 @@ static int assign_addrs (struct parport *port)
455 | PARPORT_STATUS_PAPEROUT 455 | PARPORT_STATUS_PAPEROUT
456 | PARPORT_STATUS_SELECT 456 | PARPORT_STATUS_SELECT
457 | PARPORT_STATUS_ERROR)) { 457 | PARPORT_STATUS_ERROR)) {
458 DPRINTK (KERN_DEBUG "%s: assign_addrs: aa5500ff(%02x)\n", 458 DPRINTK(KERN_DEBUG "%s: assign_addrs: aa5500ff(%02x)\n",
459 port->name, s); 459 port->name, s);
460 return 0; 460 return 0;
461 } 461 }
462 462
463 parport_write_data (port, 0x87); udelay (2); 463 parport_write_data(port, 0x87); udelay(2);
464 s = parport_read_status (port) & (PARPORT_STATUS_BUSY 464 s = parport_read_status(port) & (PARPORT_STATUS_BUSY
465 | PARPORT_STATUS_PAPEROUT 465 | PARPORT_STATUS_PAPEROUT
466 | PARPORT_STATUS_SELECT 466 | PARPORT_STATUS_SELECT
467 | PARPORT_STATUS_ERROR); 467 | PARPORT_STATUS_ERROR);
468 if (s != (PARPORT_STATUS_SELECT | PARPORT_STATUS_ERROR)) { 468 if (s != (PARPORT_STATUS_SELECT | PARPORT_STATUS_ERROR)) {
469 DPRINTK (KERN_DEBUG "%s: assign_addrs: aa5500ff87(%02x)\n", 469 DPRINTK(KERN_DEBUG "%s: assign_addrs: aa5500ff87(%02x)\n",
470 port->name, s); 470 port->name, s);
471 return 0; 471 return 0;
472 } 472 }
473 473
474 parport_write_data (port, 0x78); udelay (2); 474 parport_write_data(port, 0x78); udelay(2);
475 s = parport_read_status (port); 475 s = parport_read_status(port);
476 476
477 for (daisy = 0; 477 for (daisy = 0;
478 (s & (PARPORT_STATUS_PAPEROUT|PARPORT_STATUS_SELECT)) 478 (s & (PARPORT_STATUS_PAPEROUT|PARPORT_STATUS_SELECT))
479 == (PARPORT_STATUS_PAPEROUT|PARPORT_STATUS_SELECT) 479 == (PARPORT_STATUS_PAPEROUT|PARPORT_STATUS_SELECT)
480 && daisy < 4; 480 && daisy < 4;
481 ++daisy) { 481 ++daisy) {
482 parport_write_data (port, daisy); 482 parport_write_data(port, daisy);
483 udelay (2); 483 udelay(2);
484 parport_frob_control (port, 484 parport_frob_control(port,
485 PARPORT_CONTROL_STROBE, 485 PARPORT_CONTROL_STROBE,
486 PARPORT_CONTROL_STROBE); 486 PARPORT_CONTROL_STROBE);
487 udelay (1); 487 udelay(1);
488 parport_frob_control (port, PARPORT_CONTROL_STROBE, 0); 488 parport_frob_control(port, PARPORT_CONTROL_STROBE, 0);
489 udelay (1); 489 udelay(1);
490 490
491 add_dev (numdevs++, port, daisy); 491 add_dev(numdevs++, port, daisy);
492 492
493 /* See if this device thought it was the last in the 493 /* See if this device thought it was the last in the
494 * chain. */ 494 * chain. */
@@ -499,21 +499,21 @@ static int assign_addrs (struct parport *port)
499 last_dev from next device or if last_dev does not 499 last_dev from next device or if last_dev does not
500 work status lines from some non-daisy chain 500 work status lines from some non-daisy chain
501 device. */ 501 device. */
502 s = parport_read_status (port); 502 s = parport_read_status(port);
503 } 503 }
504 504
505 parport_write_data (port, 0xff); udelay (2); 505 parport_write_data(port, 0xff); udelay(2);
506 detected = numdevs - thisdev; 506 detected = numdevs - thisdev;
507 DPRINTK (KERN_DEBUG "%s: Found %d daisy-chained devices\n", port->name, 507 DPRINTK(KERN_DEBUG "%s: Found %d daisy-chained devices\n", port->name,
508 detected); 508 detected);
509 509
510 /* Ask the new devices to introduce themselves. */ 510 /* Ask the new devices to introduce themselves. */
511 deviceid = kmalloc (1024, GFP_KERNEL); 511 deviceid = kmalloc(1024, GFP_KERNEL);
512 if (!deviceid) return 0; 512 if (!deviceid) return 0;
513 513
514 for (daisy = 0; thisdev < numdevs; thisdev++, daisy++) 514 for (daisy = 0; thisdev < numdevs; thisdev++, daisy++)
515 parport_device_id (thisdev, deviceid, 1024); 515 parport_device_id(thisdev, deviceid, 1024);
516 516
517 kfree (deviceid); 517 kfree(deviceid);
518 return detected; 518 return detected;
519} 519}
diff --git a/drivers/pci/hotplug/Kconfig b/drivers/pci/hotplug/Kconfig
index 8a60f391ffcf..6e780db9454d 100644
--- a/drivers/pci/hotplug/Kconfig
+++ b/drivers/pci/hotplug/Kconfig
@@ -157,7 +157,7 @@ config HOTPLUG_PCI_RPA
157 tristate "RPA PCI Hotplug driver" 157 tristate "RPA PCI Hotplug driver"
158 depends on HOTPLUG_PCI && PPC_PSERIES && PPC64 && !HOTPLUG_PCI_FAKE 158 depends on HOTPLUG_PCI && PPC_PSERIES && PPC64 && !HOTPLUG_PCI_FAKE
159 help 159 help
160 Say Y here if you have a a RPA system that supports PCI Hotplug. 160 Say Y here if you have a RPA system that supports PCI Hotplug.
161 161
162 To compile this driver as a module, choose M here: the 162 To compile this driver as a module, choose M here: the
163 module will be called rpaphp. 163 module will be called rpaphp.
diff --git a/drivers/rapidio/Kconfig b/drivers/rapidio/Kconfig
index 0b2d2c3579a7..4142115d298e 100644
--- a/drivers/rapidio/Kconfig
+++ b/drivers/rapidio/Kconfig
@@ -15,4 +15,4 @@ config RAPIDIO_DISC_TIMEOUT
15 default "30" 15 default "30"
16 ---help--- 16 ---help---
17 Amount of time a discovery node waits for a host to complete 17 Amount of time a discovery node waits for a host to complete
18 enumeration beforing giving up. 18 enumeration before giving up.
diff --git a/drivers/rtc/rtc-max6902.c b/drivers/rtc/rtc-max6902.c
index 9eeef964663a..2f0b77724192 100644
--- a/drivers/rtc/rtc-max6902.c
+++ b/drivers/rtc/rtc-max6902.c
@@ -1,4 +1,4 @@
1/* drivers/char/max6902.c 1/* drivers/rtc/rtc-max6902.c
2 * 2 *
3 * Copyright (C) 2006 8D Technologies inc. 3 * Copyright (C) 2006 8D Technologies inc.
4 * Copyright (C) 2004 Compulab Ltd. 4 * Copyright (C) 2004 Compulab Ltd.
diff --git a/drivers/sbus/char/cpwatchdog.c b/drivers/sbus/char/cpwatchdog.c
index 836a58bb0305..40b6fc86f6a8 100644
--- a/drivers/sbus/char/cpwatchdog.c
+++ b/drivers/sbus/char/cpwatchdog.c
@@ -10,8 +10,6 @@
10 * timer interrupts. We use a timer to periodically 10 * timer interrupts. We use a timer to periodically
11 * reset 'stopped' watchdogs on affected platforms. 11 * reset 'stopped' watchdogs on affected platforms.
12 * 12 *
13 * TODO: DevFS support (/dev/watchdogs/0 ... /dev/watchdogs/2)
14 *
15 * Copyright (c) 2000 Eric Brower (ebrower@usa.net) 13 * Copyright (c) 2000 Eric Brower (ebrower@usa.net)
16 */ 14 */
17 15
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index dab082002e6f..c6dfb6fa13bf 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -40,10 +40,10 @@ config SCSI_PROC_FS
40 default y 40 default y
41 ---help--- 41 ---help---
42 This option enables support for the various files in 42 This option enables support for the various files in
43 /proc/scsi. In Linux 2.6 this has been superceeded by 43 /proc/scsi. In Linux 2.6 this has been superseded by
44 files in sysfs but many legacy applications rely on this. 44 files in sysfs but many legacy applications rely on this.
45 45
46 If unusure say Y. 46 If unsure say Y.
47 47
48comment "SCSI support type (disk, tape, CD-ROM)" 48comment "SCSI support type (disk, tape, CD-ROM)"
49 depends on SCSI 49 depends on SCSI
@@ -85,7 +85,7 @@ config CHR_DEV_OSST
85 tristate "SCSI OnStream SC-x0 tape support" 85 tristate "SCSI OnStream SC-x0 tape support"
86 depends on SCSI 86 depends on SCSI
87 ---help--- 87 ---help---
88 The OnStream SC-x0 SCSI tape drives can not be driven by the 88 The OnStream SC-x0 SCSI tape drives cannot be driven by the
89 standard st driver, but instead need this special osst driver and 89 standard st driver, but instead need this special osst driver and
90 use the /dev/osstX char device nodes (major 206). Via usb-storage 90 use the /dev/osstX char device nodes (major 206). Via usb-storage
91 and ide-scsi, you may be able to drive the USB-x0 and DI-x0 drives 91 and ide-scsi, you may be able to drive the USB-x0 and DI-x0 drives
diff --git a/drivers/scsi/aic7xxx/Kconfig.aic79xx b/drivers/scsi/aic7xxx/Kconfig.aic79xx
index 7955ebe8e1e8..911ea1756e55 100644
--- a/drivers/scsi/aic7xxx/Kconfig.aic79xx
+++ b/drivers/scsi/aic7xxx/Kconfig.aic79xx
@@ -22,12 +22,12 @@ config AIC79XX_CMDS_PER_DEVICE
22 to be used for any device. The aic7xxx driver will automatically 22 to be used for any device. The aic7xxx driver will automatically
23 vary this number based on device behavior. For devices with a 23 vary this number based on device behavior. For devices with a
24 fixed maximum, the driver will eventually lock to this maximum 24 fixed maximum, the driver will eventually lock to this maximum
25 and display a console message inidicating this value. 25 and display a console message indicating this value.
26 26
27 Due to resource allocation issues in the Linux SCSI mid-layer, using 27 Due to resource allocation issues in the Linux SCSI mid-layer, using
28 a high number of commands per device may result in memory allocation 28 a high number of commands per device may result in memory allocation
29 failures when many devices are attached to the system. For this reason, 29 failures when many devices are attached to the system. For this reason,
30 the default is set to 32. Higher values may result in higer performance 30 the default is set to 32. Higher values may result in higher performance
31 on some devices. The upper bound is 253. 0 disables tagged queueing. 31 on some devices. The upper bound is 253. 0 disables tagged queueing.
32 32
33 Per device tag depth can be controlled via the kernel command line 33 Per device tag depth can be controlled via the kernel command line
diff --git a/drivers/scsi/aic7xxx/Kconfig.aic7xxx b/drivers/scsi/aic7xxx/Kconfig.aic7xxx
index 5517da5855f0..cd93f9a8611f 100644
--- a/drivers/scsi/aic7xxx/Kconfig.aic7xxx
+++ b/drivers/scsi/aic7xxx/Kconfig.aic7xxx
@@ -27,12 +27,12 @@ config AIC7XXX_CMDS_PER_DEVICE
27 to be used for any device. The aic7xxx driver will automatically 27 to be used for any device. The aic7xxx driver will automatically
28 vary this number based on device behavior. For devices with a 28 vary this number based on device behavior. For devices with a
29 fixed maximum, the driver will eventually lock to this maximum 29 fixed maximum, the driver will eventually lock to this maximum
30 and display a console message inidicating this value. 30 and display a console message indicating this value.
31 31
32 Due to resource allocation issues in the Linux SCSI mid-layer, using 32 Due to resource allocation issues in the Linux SCSI mid-layer, using
33 a high number of commands per device may result in memory allocation 33 a high number of commands per device may result in memory allocation
34 failures when many devices are attached to the system. For this reason, 34 failures when many devices are attached to the system. For this reason,
35 the default is set to 32. Higher values may result in higer performance 35 the default is set to 32. Higher values may result in higher performance
36 on some devices. The upper bound is 253. 0 disables tagged queueing. 36 on some devices. The upper bound is 253. 0 disables tagged queueing.
37 37
38 Per device tag depth can be controlled via the kernel command line 38 Per device tag depth can be controlled via the kernel command line
diff --git a/drivers/scsi/arm/arxescsi.c b/drivers/scsi/arm/arxescsi.c
index a28940156703..4385e9e3ded6 100644
--- a/drivers/scsi/arm/arxescsi.c
+++ b/drivers/scsi/arm/arxescsi.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/arch/arm/drivers/scsi/arxescsi.c 2 * linux/drivers/scsi/arm/arxescsi.c
3 * 3 *
4 * Copyright (C) 1997-2000 Russell King, Stefan Hanske 4 * Copyright (C) 1997-2000 Russell King, Stefan Hanske
5 * 5 *
diff --git a/drivers/serial/21285.c b/drivers/serial/21285.c
index 57438326b07f..76d83ade9857 100644
--- a/drivers/serial/21285.c
+++ b/drivers/serial/21285.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/drivers/char/21285.c 2 * linux/drivers/serial/21285.c
3 * 3 *
4 * Driver for the serial port on the 21285 StrongArm-110 core logic chip. 4 * Driver for the serial port on the 21285 StrongArm-110 core logic chip.
5 * 5 *
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index d926272a40db..653098bc2dd5 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -121,7 +121,7 @@ config SERIAL_8250_RUNTIME_UARTS
121 default "4" 121 default "4"
122 help 122 help
123 Set this to the maximum number of serial ports you want 123 Set this to the maximum number of serial ports you want
124 the kernel to register at boot time. This can be overriden 124 the kernel to register at boot time. This can be overridden
125 with the module parameter "nr_uarts", or boot-time parameter 125 with the module parameter "nr_uarts", or boot-time parameter
126 8250.nr_uarts 126 8250.nr_uarts
127 127
@@ -205,7 +205,7 @@ config SERIAL_8250_BOCA
205 depends on SERIAL_8250 != n && ISA && SERIAL_8250_MANY_PORTS 205 depends on SERIAL_8250 != n && ISA && SERIAL_8250_MANY_PORTS
206 help 206 help
207 Say Y here if you have a Boca serial board. Please read the Boca 207 Say Y here if you have a Boca serial board. Please read the Boca
208 mini-HOWTO, avaialble from <http://www.tldp.org/docs.html#howto> 208 mini-HOWTO, available from <http://www.tldp.org/docs.html#howto>
209 209
210 To compile this driver as a module, choose M here: the module 210 To compile this driver as a module, choose M here: the module
211 will be called 8250_boca. 211 will be called 8250_boca.
@@ -667,7 +667,7 @@ config SERIAL_68328
667 depends on M68328 || M68EZ328 || M68VZ328 667 depends on M68328 || M68EZ328 || M68VZ328
668 help 668 help
669 This driver supports the built-in serial port of the Motorola 68328 669 This driver supports the built-in serial port of the Motorola 68328
670 (standard, EZ and VZ varities). 670 (standard, EZ and VZ varieties).
671 671
672config SERIAL_68328_RTS_CTS 672config SERIAL_68328_RTS_CTS
673 bool "Support RTS/CTS on 68328 serial port" 673 bool "Support RTS/CTS on 68328 serial port"
diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm1.h b/drivers/serial/cpm_uart/cpm_uart_cpm1.h
index 5d867ab581b7..5eb49ea63bfe 100644
--- a/drivers/serial/cpm_uart/cpm_uart_cpm1.h
+++ b/drivers/serial/cpm_uart/cpm_uart_cpm1.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/drivers/serial/cpm_uart_cpm1.h 2 * linux/drivers/serial/cpm_uart/cpm_uart_cpm1.h
3 * 3 *
4 * Driver for CPM (SCC/SMC) serial ports 4 * Driver for CPM (SCC/SMC) serial ports
5 * 5 *
diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm2.h b/drivers/serial/cpm_uart/cpm_uart_cpm2.h
index a663300d3476..4b779111eaf9 100644
--- a/drivers/serial/cpm_uart/cpm_uart_cpm2.h
+++ b/drivers/serial/cpm_uart/cpm_uart_cpm2.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/drivers/serial/cpm_uart_cpm2.h 2 * linux/drivers/serial/cpm_uart/cpm_uart_cpm2.h
3 * 3 *
4 * Driver for CPM (SCC/SMC) serial ports 4 * Driver for CPM (SCC/SMC) serial ports
5 * 5 *
diff --git a/drivers/usb/atm/Kconfig b/drivers/usb/atm/Kconfig
index 550ddfa71a43..b450cbaa3a0b 100644
--- a/drivers/usb/atm/Kconfig
+++ b/drivers/usb/atm/Kconfig
@@ -64,7 +64,7 @@ config USB_XUSBATM
64 Say Y here if you have a DSL USB modem not explicitly supported by 64 Say Y here if you have a DSL USB modem not explicitly supported by
65 another USB DSL drivers. In order to use your modem you will need to 65 another USB DSL drivers. In order to use your modem you will need to
66 pass the vendor ID, product ID, and endpoint numbers for transmission 66 pass the vendor ID, product ID, and endpoint numbers for transmission
67 and reception as module parameters. You may need to initialize the 67 and reception as module parameters. You may need to initialize
68 the modem using a user space utility (a firmware loader for example). 68 the modem using a user space utility (a firmware loader for example).
69 69
70 To compile this driver as a module, choose M here: the 70 To compile this driver as a module, choose M here: the
diff --git a/drivers/usb/core/file.c b/drivers/usb/core/file.c
index c376c655c5de..f794f07cfb33 100644
--- a/drivers/usb/core/file.c
+++ b/drivers/usb/core/file.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * drivers/usb/file.c 2 * drivers/usb/core/file.c
3 * 3 *
4 * (C) Copyright Linus Torvalds 1999 4 * (C) Copyright Linus Torvalds 1999
5 * (C) Copyright Johannes Erdfelt 1999-2001 5 * (C) Copyright Johannes Erdfelt 1999-2001
diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
index e4df9edf1bc0..467cb02832f3 100644
--- a/drivers/usb/core/usb.c
+++ b/drivers/usb/core/usb.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * drivers/usb/usb.c 2 * drivers/usb/core/usb.c
3 * 3 *
4 * (C) Copyright Linus Torvalds 1999 4 * (C) Copyright Linus Torvalds 1999
5 * (C) Copyright Johannes Erdfelt 1999-2001 5 * (C) Copyright Johannes Erdfelt 1999-2001
diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index 8e5dd6f29d0b..bbbc82a8336a 100644
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -7,7 +7,7 @@
7# 7#
8# - Host systems (like PCs) need CONFIG_USB (with "A" jacks). 8# - Host systems (like PCs) need CONFIG_USB (with "A" jacks).
9# - Peripherals (like PDAs) need CONFIG_USB_GADGET (with "B" jacks). 9# - Peripherals (like PDAs) need CONFIG_USB_GADGET (with "B" jacks).
10# - Some systems have both kinds of of controller. 10# - Some systems have both kinds of controllers.
11# 11#
12# With help from a special transceiver and a "Mini-AB" jack, systems with 12# With help from a special transceiver and a "Mini-AB" jack, systems with
13# both kinds of controller can also support "USB On-the-Go" (CONFIG_USB_OTG). 13# both kinds of controller can also support "USB On-the-Go" (CONFIG_USB_OTG).
diff --git a/drivers/usb/storage/Kconfig b/drivers/usb/storage/Kconfig
index 422a4b288e34..fe2c4cd53f5a 100644
--- a/drivers/usb/storage/Kconfig
+++ b/drivers/usb/storage/Kconfig
@@ -119,7 +119,7 @@ config USB_STORAGE_ALAUDA
119 Say Y here to include additional code to support the Olympus MAUSB-10 119 Say Y here to include additional code to support the Olympus MAUSB-10
120 and Fujifilm DPC-R1 USB Card reader/writer devices. 120 and Fujifilm DPC-R1 USB Card reader/writer devices.
121 121
122 These devices are based on the Alauda chip and support support both 122 These devices are based on the Alauda chip and support both
123 XD and SmartMedia cards. 123 XD and SmartMedia cards.
124 124
125config USB_STORAGE_ONETOUCH 125config USB_STORAGE_ONETOUCH
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index a1c8923b0bf5..daaa486159cf 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -188,7 +188,7 @@ config FB_ARMCLCD_SHARP_LQ035Q7DB02_HRTFT
188 bool "LogicPD LCD 3.5\" QVGA w/HRTFT IC" 188 bool "LogicPD LCD 3.5\" QVGA w/HRTFT IC"
189 help 189 help
190 This is an implementation of the Sharp LQ035Q7DB02, a 3.5" 190 This is an implementation of the Sharp LQ035Q7DB02, a 3.5"
191 color QVGA, HRTFT panel. The LogicPD device includes an 191 color QVGA, HRTFT panel. The LogicPD device includes
192 an integrated HRTFT controller IC. 192 an integrated HRTFT controller IC.
193 The native resolution is 240x320. 193 The native resolution is 240x320.
194 194
@@ -403,7 +403,7 @@ config FB_ARC
403 is based on the KS-108 lcd controller and is typically a matrix 403 is based on the KS-108 lcd controller and is typically a matrix
404 of 2*n chips. This driver was tested with a 128x64 panel. This 404 of 2*n chips. This driver was tested with a 128x64 panel. This
405 driver supports it for use with x86 SBCs through a 16 bit GPIO 405 driver supports it for use with x86 SBCs through a 16 bit GPIO
406 interface (8 bit data, 8 bit control). If you anticpate using 406 interface (8 bit data, 8 bit control). If you anticipate using
407 this driver, say Y or M; otherwise say N. You must specify the 407 this driver, say Y or M; otherwise say N. You must specify the
408 GPIO IO address to be used for setting control and data. 408 GPIO IO address to be used for setting control and data.
409 409
@@ -771,7 +771,7 @@ config FB_RIVA_DEBUG
771 default n 771 default n
772 help 772 help
773 Say Y here if you want the Riva driver to output all sorts 773 Say Y here if you want the Riva driver to output all sorts
774 of debugging informations to provide to the maintainer when 774 of debugging information to provide to the maintainer when
775 something goes wrong. 775 something goes wrong.
776 776
777config FB_RIVA_BACKLIGHT 777config FB_RIVA_BACKLIGHT
@@ -865,7 +865,7 @@ config FB_INTEL_DEBUG
865 depends on FB_INTEL 865 depends on FB_INTEL
866 ---help--- 866 ---help---
867 Say Y here if you want the Intel driver to output all sorts 867 Say Y here if you want the Intel driver to output all sorts
868 of debugging informations to provide to the maintainer when 868 of debugging information to provide to the maintainer when
869 something goes wrong. 869 something goes wrong.
870 870
871config FB_INTEL_I2C 871config FB_INTEL_I2C
@@ -1062,7 +1062,7 @@ config FB_RADEON_DEBUG
1062 default n 1062 default n
1063 help 1063 help
1064 Say Y here if you want the Radeon driver to output all sorts 1064 Say Y here if you want the Radeon driver to output all sorts
1065 of debugging informations to provide to the maintainer when 1065 of debugging information to provide to the maintainer when
1066 something goes wrong. 1066 something goes wrong.
1067 1067
1068config FB_ATY128 1068config FB_ATY128
diff --git a/drivers/video/s3c2410fb.h b/drivers/video/s3c2410fb.h
index be40968f899e..f3f8a8e15012 100644
--- a/drivers/video/s3c2410fb.h
+++ b/drivers/video/s3c2410fb.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * linux/drivers/s3c2410fb.h 2 * linux/drivers/video/s3c2410fb.h
3 * Copyright (c) Arnaud Patard 3 * Copyright (c) Arnaud Patard
4 * 4 *
5 * This file is subject to the terms and conditions of the GNU General Public 5 * This file is subject to the terms and conditions of the GNU General Public
diff --git a/drivers/w1/Kconfig b/drivers/w1/Kconfig
index 8b3d0f0c7bd5..27c9d05d03ef 100644
--- a/drivers/w1/Kconfig
+++ b/drivers/w1/Kconfig
@@ -21,7 +21,7 @@ config W1_CON
21 There are three types of messages between w1 core and userspace: 21 There are three types of messages between w1 core and userspace:
22 1. Events. They are generated each time new master or slave device found 22 1. Events. They are generated each time new master or slave device found
23 either due to automatic or requested search. 23 either due to automatic or requested search.
24 2. Userspace commands. Includes read/write and search/alarm search comamnds. 24 2. Userspace commands. Includes read/write and search/alarm search commands.
25 3. Replies to userspace commands. 25 3. Replies to userspace commands.
26 26
27source drivers/w1/masters/Kconfig 27source drivers/w1/masters/Kconfig