Skip to content

L
linux-davinci
Commit 2a9f0ba7 authored by Mark Brown's avatar Mark Brown
Browse files
Options

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

parents 65ec1cd1 603b6fd5
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 2 deletions
arch/arm/mach-s3c2410/include/mach/io.h
View file @ 2a9f0ba7
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#ifndef __ASM_ARM_ARCH_IO_H #ifndef __ASM_ARM_ARCH_IO_H
#define __ASM_ARM_ARCH_IO_H #define __ASM_ARM_ARCH_IO_H
#include <mach/map.h> #include <mach/hardware.h>
#define IO_SPACE_LIMIT 0xffffffff #define IO_SPACE_LIMIT 0xffffffff
......
arch/arm/plat-s3c24xx/clock-dclk.c
View file @ 2a9f0ba7
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
#include <mach/regs-clock.h> #include <mach/regs-clock.h>
#include <mach/regs-gpio.h> #include <mach/regs-gpio.h>
#include <mach/hardware.h>
#include <plat/clock.h> #include <plat/clock.h>
#include <plat/cpu.h> #include <plat/cpu.h>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment