diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2006-12-08 01:07:56 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2006-12-08 01:07:56 -0500 |
| commit | bef986502fa398b1785a3979b1aa17cd902d3527 (patch) | |
| tree | b59c1afe7b1dfcc001b86e54863f550d7ddc8c34 /drivers/macintosh/Kconfig | |
| parent | 4bdbd2807deeccc0793d57fb5120d7a53f2c0b3c (diff) | |
| parent | c99767974ebd2a719d849fdeaaa1674456f5283f (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/usb/input/hid.h
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 31015d55d353..a9e747c39791 100644 --- a/drivers/macintosh/Kconfig +++ b/drivers/macintosh/Kconfig | |||
| @@ -227,4 +227,11 @@ config ANSLCD | |||
| 227 | tristate "Support for ANS LCD display" | 227 | tristate "Support for ANS LCD display" |
| 228 | depends on ADB_CUDA && PPC_PMAC | 228 | depends on ADB_CUDA && PPC_PMAC |
| 229 | 229 | ||
| 230 | config PMAC_RACKMETER | ||
| 231 | tristate "Support for Apple XServe front panel LEDs" | ||
| 232 | depends on PPC_PMAC | ||
| 233 | help | ||
| 234 | This driver procides some support to control the front panel | ||
| 235 | blue LEDs "vu-meter" of the XServer macs. | ||
| 236 | |||
| 230 | endmenu | 237 | endmenu |