diff options
| author | David Howells <dhowells@redhat.com> | 2006-12-05 09:37:56 -0500 |
|---|---|---|
| committer | David Howells <dhowells@warthog.cambridge.redhat.com> | 2006-12-05 09:37:56 -0500 |
| commit | 4c1ac1b49122b805adfa4efc620592f68dccf5db (patch) | |
| tree | 87557f4bc2fd4fe65b7570489c2f610c45c0adcd /arch/sparc/Kconfig | |
| parent | c4028958b6ecad064b1a6303a6a5906d4fe48d73 (diff) | |
| parent | d916faace3efc0bf19fe9a615a1ab8fa1a24cd93 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/infiniband/core/iwcm.c
drivers/net/chelsio/cxgb2.c
drivers/net/wireless/bcm43xx/bcm43xx_main.c
drivers/net/wireless/prism54/islpci_eth.c
drivers/usb/core/hub.h
drivers/usb/input/hid-core.c
net/core/netpoll.c
Fix up merge failures with Linus's head and fix new compilation failures.
Signed-Off-By: David Howells <dhowells@redhat.com>
Diffstat (limited to 'arch/sparc/Kconfig')
| -rw-r--r-- | arch/sparc/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig index 2f96610a83e9..92a7c8a636d3 100644 --- a/arch/sparc/Kconfig +++ b/arch/sparc/Kconfig | |||
| @@ -212,8 +212,8 @@ config SPARC_LED | |||
| 212 | tristate "Sun4m LED driver" | 212 | tristate "Sun4m LED driver" |
| 213 | help | 213 | help |
| 214 | This driver toggles the front-panel LED on sun4m systems | 214 | This driver toggles the front-panel LED on sun4m systems |
| 215 | in a user-specifyable manner. It's state can be probed | 215 | in a user-specifiable manner. Its state can be probed |
| 216 | by reading /proc/led and it's blinking mode can be changed | 216 | by reading /proc/led and its blinking mode can be changed |
| 217 | via writes to /proc/led | 217 | via writes to /proc/led |
| 218 | 218 | ||
| 219 | source "fs/Kconfig.binfmt" | 219 | source "fs/Kconfig.binfmt" |