diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-07 02:53:30 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-07 02:53:30 -0400 |
| commit | 4a35ecf8bf1c4b039503fa554100fe85c761de76 (patch) | |
| tree | 9b75f5d5636004d9a9aa496924377379be09aa1f /drivers/leds/Makefile | |
| parent | b4d562e3c3553ac58c7120555c4e4aefbb090a2a (diff) | |
| parent | fb9e2d887243499b8d28efcf80821c4f6a092395 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/bonding/bond_main.c
drivers/net/via-velocity.c
drivers/net/wireless/iwlwifi/iwl-agn.c
Diffstat (limited to 'drivers/leds/Makefile')
| -rw-r--r-- | drivers/leds/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/leds/Makefile b/drivers/leds/Makefile index d76fb32b77c0..0cd8b9957380 100644 --- a/drivers/leds/Makefile +++ b/drivers/leds/Makefile | |||
| @@ -34,6 +34,7 @@ obj-$(CONFIG_LEDS_REGULATOR) += leds-regulator.o | |||
| 34 | obj-$(CONFIG_LEDS_INTEL_SS4200) += leds-ss4200.o | 34 | obj-$(CONFIG_LEDS_INTEL_SS4200) += leds-ss4200.o |
| 35 | obj-$(CONFIG_LEDS_LT3593) += leds-lt3593.o | 35 | obj-$(CONFIG_LEDS_LT3593) += leds-lt3593.o |
| 36 | obj-$(CONFIG_LEDS_ADP5520) += leds-adp5520.o | 36 | obj-$(CONFIG_LEDS_ADP5520) += leds-adp5520.o |
| 37 | obj-$(CONFIG_LEDS_DELL_NETBOOKS) += dell-led.o | ||
| 37 | 38 | ||
| 38 | # LED SPI Drivers | 39 | # LED SPI Drivers |
| 39 | obj-$(CONFIG_LEDS_DAC124S085) += leds-dac124s085.o | 40 | obj-$(CONFIG_LEDS_DAC124S085) += leds-dac124s085.o |