diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-06 17:32:52 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-06 17:32:52 -0500 |
| commit | 4073723acb9cdcdbe4df9c0e0c376c65d1697e43 (patch) | |
| tree | f41c17eac157b1223ce104845cf9b1e5a9e6a83d /arch/sh/Kconfig | |
| parent | 58daf18cdcab550262a5f4681e1f1e073e21965a (diff) | |
| parent | 4ec3eb13634529c0bc7466658d84d0bbe3244aea (diff) | |
Merge branch 'misc' into devel
Conflicts:
arch/arm/Kconfig
arch/arm/common/Makefile
arch/arm/kernel/Makefile
arch/arm/kernel/smp.c
Diffstat (limited to 'arch/sh/Kconfig')
| -rw-r--r-- | arch/sh/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index 2e9d78d21fd3..25cf0b34dffd 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | config SUPERH | 1 | config SUPERH |
| 2 | def_bool y | 2 | def_bool y |
| 3 | select EMBEDDED | 3 | select EMBEDDED |
| 4 | select HAVE_CLK | 4 | select CLKDEV_LOOKUP |
| 5 | select HAVE_IDE if HAS_IOPORT | 5 | select HAVE_IDE if HAS_IOPORT |
| 6 | select HAVE_MEMBLOCK | 6 | select HAVE_MEMBLOCK |
| 7 | select HAVE_OPROFILE | 7 | select HAVE_OPROFILE |