diff options
| author | David S. Miller <davem@davemloft.net> | 2009-08-12 20:44:53 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-08-12 20:44:53 -0400 |
| commit | aa11d958d1a6572eda08214d7c6a735804fe48a5 (patch) | |
| tree | d025b05270ad1e010660d17eeadc6ac3c1abbd7d /drivers/mfd/dm355evm_msp.c | |
| parent | 07f6642ee9418e962e54cbc07471cfe2e559c568 (diff) | |
| parent | 9799218ae36910af50f002a5db1802d576fffb43 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
arch/microblaze/include/asm/socket.h
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 |