diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-08 13:54:23 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-08 13:54:23 -0500 |
| commit | 934648f0449fae00946f55d64cd998bb5587fa1f (patch) | |
| tree | a8c5e55cfbfff34497f6ec873ea31725fdb849ab /arch/arm/mach-shmobile/Kconfig | |
| parent | 8be5814c45d1412c6c16cf9be73e507f5fe53c1b (diff) | |
| parent | 65670a1b75874cf36c81456f2fb1e5ef6c6c0a55 (diff) | |
Merge branch 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
mmc: sh_mmcif: Convert extern inline to static inline.
ARM: mach-shmobile: Allow GPIO chips to register IRQ mappings.
ARM: mach-shmobile: fix sh7372 after a recent clock framework rework
ARM: mach-shmobile: include drivers/sh/Kconfig
ARM: mach-shmobile: ap4evb: Add HDMI sound support
ARM: mach-shmobile: clock-sh7372: Add FSIDIV clock support
ARM: shmobile: remove sh_timer_config clk member
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 | |||
| 116 | config SH_CLK_CPG | 116 | config SH_CLK_CPG |
| 117 | bool | 117 | bool |
| 118 | 118 | ||
| 119 | source "drivers/sh/Kconfig" | ||
| 120 | |||
| 119 | endif | 121 | endif |