diff options
| author |   Paul Mundt <lethal@linux-sh.org> | 2010-11-08 09:51:41 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-11-08 09:51:41 +0900 |
| commit | 65670a1b75874cf36c81456f2fb1e5ef6c6c0a55 (patch) | |
| tree | 48aa7cfb7a6a5521727a272d7dcfdc7083966513 /arch/arm/mach-shmobile/Kconfig | |
| parent | ipw2x00: remove the right /proc/net entry (diff) | |
| parent | mmc: sh_mmcif: Convert extern inline to static inline. (diff) | |
| download | linux-dev-65670a1b75874cf36c81456f2fb1e5ef6c6c0a55.tar.xz linux-dev-65670a1b75874cf36c81456f2fb1e5ef6c6c0a55.zip | |
Merge branch 'rmobile/core' into rmobile-fixes-for-linus
Diffstat (limited to 'arch/arm/mach-shmobile/Kconfig')
| -rw-r--r-- | arch/arm/mach-shmobile/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig index 54b479c35ee0..51dcd59eda6a 100644 --- a/arch/arm/mach-shmobile/Kconfig +++ b/arch/arm/mach-shmobile/Kconfig @@ -116,4 +116,6 @@ endmenu config SH_CLK_CPG bool +source "drivers/sh/Kconfig" + endif |