diff options
| author | Olof Johansson <olof@lixom.net> | 2012-04-14 17:50:45 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-04-14 17:50:45 -0700 |
| commit | 961a238c38a2716511dbd8e0f34d49dd46160007 (patch) | |
| tree | 56a9ed1ae579ce0cc6453c9dc1202f99402df3fc /arch/arm/mach-exynos/mach-exynos5-dt.c | |
| parent | 47d9e44d1dbabc53500e86d5597f2737a40f1f42 (diff) | |
| parent | 5ad14306a3f468df61e1739f9f252663f18f1702 (diff) | |
| download | op-kernel-dev-961a238c38a2716511dbd8e0f34d49dd46160007.zip op-kernel-dev-961a238c38a2716511dbd8e0f34d49dd46160007.tar.gz | |
Merge branch 'v3.4-samsung-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes
* 'v3.4-samsung-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: EXYNOS: Fix Kconfig dependencies for device tree enabled machine files
ARM: EXYNOS: Remove broken config values for touchscren for NURI board
ARM: EXYNOS: set fix xusbxti clock for NURI and Universal210 boards
ARM: EXYNOS: fix regulator name for NURI board
ARM: SAMSUNG: make SAMSUNG_PM_DEBUG select DEBUG_LL
ARM: EXYNOS: Add PDMA and MDMA physical base address defines
ARM: S5PV210: Fix compiler warning in dma.c file
ARM: EXYNOS: Fix compile error in exynos5250-cpufreq.c
ARM: EXYNOS: Add missing definition for IRQ_I2S0
ARM: S5PV210: fix unused LDO supply field from wm8994_pdata
Diffstat (limited to 'arch/arm/mach-exynos/mach-exynos5-dt.c')
| -rw-r--r-- | arch/arm/mach-exynos/mach-exynos5-dt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-exynos/mach-exynos5-dt.c b/arch/arm/mach-exynos/mach-exynos5-dt.c index 0d26f50..4711c89 100644 --- a/arch/arm/mach-exynos/mach-exynos5-dt.c +++ b/arch/arm/mach-exynos/mach-exynos5-dt.c @@ -45,7 +45,7 @@ static const struct of_dev_auxdata exynos5250_auxdata_lookup[] __initconst = { "exynos4210-uart.3", NULL), OF_DEV_AUXDATA("arm,pl330", EXYNOS5_PA_PDMA0, "dma-pl330.0", NULL), OF_DEV_AUXDATA("arm,pl330", EXYNOS5_PA_PDMA1, "dma-pl330.1", NULL), - OF_DEV_AUXDATA("arm,pl330", EXYNOS5_PA_PDMA1, "dma-pl330.2", NULL), + OF_DEV_AUXDATA("arm,pl330", EXYNOS5_PA_MDMA1, "dma-pl330.2", NULL), {}, }; |
