diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-02-04 14:52:10 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-02-04 14:52:10 +1100 |
| commit | 539e6a054a5f51fec9d1ac1c9598f4c4fa0786be (patch) | |
| tree | 6d92bce407ea587aaa1b75a2e9490726b8bedaab | |
| parent | 9b4376bdd4ee15dc8fcbae1d751fd0d36286c81e (diff) | |
| parent | 666d7c1828d1f249580bd21a077120a6f1c1642c (diff) | |
Merge remote branch 'leds/for-mm'
| -rw-r--r-- | drivers/leds/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/leds/led-class.c | 2 | ||||
| -rw-r--r-- | drivers/leds/leds-ss4200.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig index 8a0e1ec95e4a..fef1cf406998 100644 --- a/drivers/leds/Kconfig +++ b/drivers/leds/Kconfig @@ -72,7 +72,7 @@ config LEDS_WRAP config LEDS_ALIX2 tristate "LED Support for ALIX.2 and ALIX.3 series" - depends on LEDS_CLASS && X86 && EXPERIMENTAL + depends on LEDS_CLASS && X86 && !GPIO_CS5535 && !CS5535_GPIO help This option enables support for the PCEngines ALIX.2 and ALIX.3 LEDs. You have to set leds-alix2.force=1 for boards with Award BIOS. diff --git a/drivers/leds/led-class.c b/drivers/leds/led-class.c index 782f95822eab..349e07350144 100644 --- a/drivers/leds/led-class.c +++ b/drivers/leds/led-class.c @@ -164,7 +164,7 @@ int led_classdev_register(struct device *parent, struct led_classdev *led_cdev) led_trigger_set_default(led_cdev); #endif - printk(KERN_INFO "Registered led device: %s\n", + printk(KERN_DEBUG "Registered led device: %s\n", led_cdev->name); return 0; diff --git a/drivers/leds/leds-ss4200.c b/drivers/leds/leds-ss4200.c index 97f04984c1ca..51477ec71391 100644 --- a/drivers/leds/leds-ss4200.c +++ b/drivers/leds/leds-ss4200.c @@ -63,7 +63,7 @@ MODULE_LICENSE("GPL"); /* * PCI ID of the Intel ICH7 LPC Device within which the GPIO block lives. */ -static struct pci_device_id ich7_lpc_pci_id[] = +static const struct pci_device_id ich7_lpc_pci_id[] = { { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7_0) }, { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7_1) }, |