diff options
| author | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-06-04 19:45:30 +0800 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-06-04 19:45:30 +0800 |
| commit | 1cd04b2aba9f3b3468adf0789030240e032d8d3e (patch) | |
| tree | 2e010c15b347b7acda9bc7a2ab4abca9d58043eb /arch/arm/mach-ux500/Kconfig | |
| parent | cff72c10aa27e3a74eb5d5b7ceb7808d8c917d15 (diff) | |
| parent | b7086e0a1dec82bf7e8e96e17738151f0aee82fc (diff) | |
Merge topic branch 'video' into integration-linux-ux500
Signed-off-by: Philippe Langlais <philippe.langlais@stericsson.com>
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 a2af24dd3b9..5b81df73186 100644 --- a/arch/arm/mach-ux500/Kconfig +++ b/arch/arm/mach-ux500/Kconfig @@ -206,4 +206,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 |