diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-05-07 10:51:38 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-05-07 10:51:48 +0200 |
| commit | 4cb1f43ce8c72ee453c00fcb9f6ee9c4ebd03f98 (patch) | |
| tree | 15e64f192b54ea01fd640d69eed0cabed2baaaa9 /arch/blackfin/configs/BF527-AD7160-EVAL_defconfig | |
| parent | x86: Fix spelling error in the memcpy() source code comment (diff) | |
| parent | Linux 2.6.39-rc6 (diff) | |
| download | linux-4cb1f43ce8c72ee453c00fcb9f6ee9c4ebd03f98.tar.xz linux-4cb1f43ce8c72ee453c00fcb9f6ee9c4ebd03f98.zip | |
Merge commit 'v2.6.39-rc6' into x86/cleanups
Merge reason: move to a (much) newer upstream base.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/blackfin/configs/BF527-AD7160-EVAL_defconfig')
| -rw-r--r-- | arch/blackfin/configs/BF527-AD7160-EVAL_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/blackfin/configs/BF527-AD7160-EVAL_defconfig b/arch/blackfin/configs/BF527-AD7160-EVAL_defconfig index 362f59dd5228..ad0881ba30af 100644 --- a/arch/blackfin/configs/BF527-AD7160-EVAL_defconfig +++ b/arch/blackfin/configs/BF527-AD7160-EVAL_defconfig @@ -46,7 +46,6 @@ CONFIG_UNIX=y # CONFIG_WIRELESS is not set CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_RAM=y -# CONFIG_MISC_DEVICES is not set # CONFIG_INPUT_MOUSEDEV is not set CONFIG_INPUT_EVDEV=y # CONFIG_INPUT_KEYBOARD is not set |