diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-13 03:28:45 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-13 03:28:45 -0400 |
| commit | 9343af084c7e8911897b0883042ee690cee3aaef (patch) | |
| tree | 6211a4bdc84690bec6530d27a3abb19f5e8bb8f3 /drivers/leds/leds-pca955x.c | |
| parent | e182c77cc291456eed127b1472952ddb59a81a9d (diff) | |
| parent | 0d0fb0f9c5fddef4a10242fe3337f00f528a3099 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
lib/Kconfig.debug
Diffstat (limited to 'drivers/leds/leds-pca955x.c')
| -rw-r--r-- | drivers/leds/leds-pca955x.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/leds/leds-pca955x.c b/drivers/leds/leds-pca955x.c index 4e2d1a42b48f..8ff50f234190 100644 --- a/drivers/leds/leds-pca955x.c +++ b/drivers/leds/leds-pca955x.c | |||
| @@ -48,6 +48,7 @@ | |||
| 48 | #include <linux/err.h> | 48 | #include <linux/err.h> |
| 49 | #include <linux/i2c.h> | 49 | #include <linux/i2c.h> |
| 50 | #include <linux/workqueue.h> | 50 | #include <linux/workqueue.h> |
| 51 | #include <linux/slab.h> | ||
| 51 | 52 | ||
| 52 | /* LED select registers determine the source that drives LED outputs */ | 53 | /* LED select registers determine the source that drives LED outputs */ |
| 53 | #define PCA955X_LS_LED_ON 0x0 /* Output LOW */ | 54 | #define PCA955X_LS_LED_ON 0x0 /* Output LOW */ |