diff options
| author | James Morris <jmorris@namei.org> | 2009-07-13 10:30:40 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-07-13 10:30:40 -0400 |
| commit | 7d45ecafb6792ca68da9517969d37d910601845f (patch) | |
| tree | a98b1074e5577e66a97963745f975404d0aac266 /drivers/mfd/dm355evm_msp.c | |
| parent | be940d6279c30a2d7c4e8d1d5435f957f594d66d (diff) | |
| parent | 7638d5322bd89d49e013a03fe2afaeb6d214fabd (diff) | |
Merge branch 'master' into next
Conflicts:
include/linux/personality.h
Use Linus' version.
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'drivers/mfd/dm355evm_msp.c')
| -rw-r--r-- | drivers/mfd/dm355evm_msp.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/mfd/dm355evm_msp.c b/drivers/mfd/dm355evm_msp.c index 7ac12cb0be4a..5b6e58a3ba46 100644 --- a/drivers/mfd/dm355evm_msp.c +++ b/drivers/mfd/dm355evm_msp.c | |||
| @@ -32,8 +32,7 @@ | |||
| 32 | * This driver was tested with firmware revision A4. | 32 | * This driver was tested with firmware revision A4. |
| 33 | */ | 33 | */ |
| 34 | 34 | ||
| 35 | #if defined(CONFIG_KEYBOARD_DM355EVM) \ | 35 | #if defined(CONFIG_INPUT_DM355EVM) || defined(CONFIG_INPUT_DM355EVM_MODULE) |
| 36 | || defined(CONFIG_KEYBOARD_DM355EVM_MODULE) | ||
| 37 | #define msp_has_keyboard() true | 36 | #define msp_has_keyboard() true |
| 38 | #else | 37 | #else |
| 39 | #define msp_has_keyboard() false | 38 | #define msp_has_keyboard() false |