From 2b2fd05bcf7b4cd8bd15bf206cea25719b268e9e Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Sat, 3 Nov 2012 13:37:15 +0100 Subject: [PATCH] --- yaml --- r: 342282 b: refs/heads/master c: cece5c4009355323c6f453ef6814e7dd85a0f896 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-ux500/cpu-db8500.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index cb8e31ef50f8..8d7b53002757 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 79b1c9e69de27813c7b270b1fbe0880c7b537def +refs/heads/master: cece5c4009355323c6f453ef6814e7dd85a0f896 diff --git a/trunk/arch/arm/mach-ux500/cpu-db8500.c b/trunk/arch/arm/mach-ux500/cpu-db8500.c index 4a0c40abf2ab..d2076ce22e97 100644 --- a/trunk/arch/arm/mach-ux500/cpu-db8500.c +++ b/trunk/arch/arm/mach-ux500/cpu-db8500.c @@ -262,11 +262,10 @@ static struct device * __init u8500_of_init_devices(void) static struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = { /* Requires call-back bindings. */ OF_DEV_AUXDATA("arm,cortex-a9-pmu", 0, "arm-pmu", &db8500_pmu_platdata), - /* Requires DMA and call-back bindings. */ + /* Requires DMA bindings. */ OF_DEV_AUXDATA("arm,pl011", 0x80120000, "uart0", &uart0_plat), OF_DEV_AUXDATA("arm,pl011", 0x80121000, "uart1", &uart1_plat), OF_DEV_AUXDATA("arm,pl011", 0x80007000, "uart2", &uart2_plat), - /* Requires DMA bindings. */ OF_DEV_AUXDATA("arm,pl022", 0x80002000, "ssp0", &ssp0_plat), OF_DEV_AUXDATA("arm,pl18x", 0x80126000, "sdi0", &mop500_sdi0_data), OF_DEV_AUXDATA("arm,pl18x", 0x80118000, "sdi1", &mop500_sdi1_data),