Merge branch 's3c-iis-header' into for-2.6.30

This commit is contained in:
Mark Brown 2009-03-11 18:30:48 +00:00
commit 2a9f0ba7a9
2 changed files with 1 additions and 2 deletions

View File

@ -9,7 +9,7 @@
#ifndef __ASM_ARM_ARCH_IO_H
#define __ASM_ARM_ARCH_IO_H
#include <mach/map.h>
#include <mach/hardware.h>
#define IO_SPACE_LIMIT 0xffffffff

View File

@ -18,7 +18,6 @@
#include <mach/regs-clock.h>
#include <mach/regs-gpio.h>
#include <mach/hardware.h>
#include <plat/clock.h>
#include <plat/cpu.h>