diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-08-04 00:52:34 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-08-04 00:52:34 -0400 |
| commit | baea90ea14b316e4599f000c713e446908a5aef6 (patch) | |
| tree | 17eae40f15832b466121d8f962028472c4568a13 /arch/sh/Kconfig | |
| parent | 36239c6704b71da7fb8e2a9429e159a84d0c5a3e (diff) | |
| parent | 3a09b1be53d23df780a0cd0e4087a05e2ca4a00c (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
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 4b5a1d53704d..c91934186896 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig | |||
| @@ -10,7 +10,7 @@ config SUPERH | |||
| 10 | select EMBEDDED | 10 | select EMBEDDED |
| 11 | select HAVE_CLK | 11 | select HAVE_CLK |
| 12 | select HAVE_IDE if HAS_IOPORT | 12 | select HAVE_IDE if HAS_IOPORT |
| 13 | select HAVE_LMB | 13 | select HAVE_MEMBLOCK |
| 14 | select HAVE_OPROFILE | 14 | select HAVE_OPROFILE |
| 15 | select HAVE_GENERIC_DMA_COHERENT | 15 | select HAVE_GENERIC_DMA_COHERENT |
| 16 | select HAVE_ARCH_TRACEHOOK | 16 | select HAVE_ARCH_TRACEHOOK |