diff options
| author | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-04-06 11:11:25 +0200 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-04-06 11:11:25 +0200 |
| commit | 1824f16fd3633ea156a90926db7fca2606481346 (patch) | |
| tree | 428667dbccfe0fdf8d33bee5a18e8cf1aa0b7767 /arch/arm/mach-ux500/Kconfig | |
| parent | 453e007c74a011b84260aab6c28250635de2e322 (diff) | |
| parent | f7d8ac55db0b41ed64c4cd37f5d51bbd5bb8e776 (diff) | |
Merge topic branch 'video' into integration-linux-ux500-3.3
Diffstat (limited to 'arch/arm/mach-ux500/Kconfig')
| -rw-r--r-- | arch/arm/mach-ux500/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-ux500/Kconfig b/arch/arm/mach-ux500/Kconfig index 63ce739d3ef..eb282453e10 100644 --- a/arch/arm/mach-ux500/Kconfig +++ b/arch/arm/mach-ux500/Kconfig @@ -187,4 +187,6 @@ config UX500_DB_DUMP source "arch/arm/mach-ux500/pm/Kconfig" source "arch/arm/mach-ux500/test/Kconfig" +source "arch/arm/mach-ux500/Kconfig-arch" + endif |