Merge branches 'master' and 'devel' into for-linus

Conflicts:
	arch/arm/Kconfig
	arch/arm/mm/Kconfig

1 files changed, 6 insertions, 1 deletions

diff --git a/arch/arm/mach-s5pv210/dev-onenand.c b/arch/arm/mach-s5pv210/dev-onenand.c
index 34997b752f93..f8ede33ee82b 100644
--- a/arch/arm/mach-s5pv210/dev-onenand.c
+++ b/arch/arm/mach-s5pv210/dev-onenand.c
@@ -27,9 +27,14 @@ static struct resource s5pc110_onenand_resources[] = {
         },
         [1] = {
                 .start  = S5PC110_PA_ONENAND_DMA,
-                .end    = S5PC110_PA_ONENAND_DMA + SZ_2K - 1,
+                .end    = S5PC110_PA_ONENAND_DMA + SZ_8K - 1,
                 .flags  = IORESOURCE_MEM,
         },
+        [2] = {
+                .start  = IRQ_ONENAND_AUDI,
+                .end    = IRQ_ONENAND_AUDI,
+                .flags  = IORESOURCE_IRQ,
+        },
 };
 
 struct platform_device s5pc110_device_onenand = {