Merge branch 's3c-move' into devel
Conflicts: arch/arm/mach-versatile/core.c
This commit is contained in:
@@ -34,9 +34,9 @@
|
||||
#include <mach/regs-irq.h>
|
||||
#include <mach/regs-gpio.h>
|
||||
|
||||
#include <asm/plat-s3c24xx/cpu.h>
|
||||
#include <asm/plat-s3c24xx/pm.h>
|
||||
#include <asm/plat-s3c24xx/irq.h>
|
||||
#include <plat/cpu.h>
|
||||
#include <plat/pm.h>
|
||||
#include <plat/irq.h>
|
||||
|
||||
/* WDT/AC97 */
|
||||
|
||||
|
Reference in New Issue
Block a user