diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-02-18 17:11:00 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-02-18 17:11:00 +1100 |
| commit | 34f3393e287c0aea684b1c71bc864c874c5c9bb1 (patch) | |
| tree | 003d7b551d2f7f0dc95a8a79ad131432f5965037 /drivers/Makefile | |
| parent | 100829602090f24e5b054b37e124c64fd766f03c (diff) | |
| parent | 6600f58cfc348ef5862876ab4965d95aad793429 (diff) | |
Merge remote branch 'als/for-next'
Conflicts:
drivers/misc/Kconfig
Diffstat (limited to 'drivers/Makefile')
| -rw-r--r-- | drivers/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/Makefile b/drivers/Makefile index 19e82b9c91c2..084a7f620cd6 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -77,6 +77,7 @@ obj-$(CONFIG_PPS) += pps/ obj-$(CONFIG_W1) += w1/ obj-$(CONFIG_POWER_SUPPLY) += power/ obj-$(CONFIG_HWMON) += hwmon/ +obj-$(CONFIG_ALS) += als/ obj-$(CONFIG_THERMAL) += thermal/ obj-$(CONFIG_WATCHDOG) += watchdog/ obj-$(CONFIG_PHONE) += telephony/ |