diff options
| author | David Howells <dhowells@redhat.com> | 2006-12-05 12:01:28 -0500 |
|---|---|---|
| committer | David Howells <dhowells@warthog.cambridge.redhat.com> | 2006-12-05 12:01:28 -0500 |
| commit | 9db73724453a9350e1c22dbe732d427e2939a5c9 (patch) | |
| tree | 15e3ead6413ae97398a54292acc199bee0864d42 /drivers/macintosh/Kconfig | |
| parent | 4c1ac1b49122b805adfa4efc620592f68dccf5db (diff) | |
| parent | e62438630ca37539c8cc1553710bbfaa3cf960a7 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/ata/libata-scsi.c
include/linux/libata.h
Futher merge of Linus's head and compilation fixups.
Signed-Off-By: David Howells <dhowells@redhat.com>
Diffstat (limited to 'drivers/macintosh/Kconfig')
| -rw-r--r-- | drivers/macintosh/Kconfig | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/macintosh/Kconfig b/drivers/macintosh/Kconfig index 7f8477d3a661..92ccee85e2a2 100644 --- a/drivers/macintosh/Kconfig +++ b/drivers/macintosh/Kconfig | |||
| @@ -228,4 +228,11 @@ config ANSLCD | |||
| 228 | tristate "Support for ANS LCD display" | 228 | tristate "Support for ANS LCD display" |
| 229 | depends on ADB_CUDA && PPC_PMAC | 229 | depends on ADB_CUDA && PPC_PMAC |
| 230 | 230 | ||
| 231 | config PMAC_RACKMETER | ||
| 232 | tristate "Support for Apple XServe front panel LEDs" | ||
| 233 | depends on PPC_PMAC | ||
| 234 | help | ||
| 235 | This driver procides some support to control the front panel | ||
| 236 | blue LEDs "vu-meter" of the XServer macs. | ||
| 237 | |||
| 231 | endmenu | 238 | endmenu |