Message ID | 1238737024-14647-1-git-send-email-jarkko.nikula@nokia.com (mailing list archive) |
---|---|
State | Accepted |
Commit | 7b4c6760b933f3209747b3d158ac4d78dcfb19d9 |
Headers | show |
This patch has been applied to the linux-omap by youw fwiendly patch wobot. Commit: 7b4c6760b933f3209747b3d158ac4d78dcfb19d9 PatchWorks http://patchwork.kernel.org/patch/16030/ Git http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commit;h=7b4c6760b933f3209747b3d158ac4d78dcfb19d9 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index 2568b0c..0bda713 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c @@ -369,12 +369,12 @@ static inline void omap_init_mcspi(void) {} #ifdef CONFIG_SND_OMAP24XX_EAC -#define OMAP2_EAC_BASE (L4_24XX_BASE + 0x90000) +#define OMAP2_EAC_BASE 0x48090000 static struct resource omap2_eac_resources[] = { { .start = OMAP2_EAC_BASE, - .end = OMAP2_EAC_BASE + 0xfff, + .end = OMAP2_EAC_BASE + 0x109, .flags = IORESOURCE_MEM, }, };
This is partial revert for commit 3a02c1ae56a61c5249594553735ff32557e2e7ed and only purpose is to sync these lines with mainline version and to have common cleanup patch for both linux-omap and mainline. Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com> --- arch/arm/mach-omap2/devices.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)