Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2a9f0ba7 authored by Mark Brown's avatar Mark Brown
Browse files

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

parents 65ec1cd1 603b6fd5

arch/arm/mach-s3c2410/include/mach/io.h

+1 −1
Original line number Diff line number Diff line
@@ -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

arch/arm/plat-s3c24xx/clock-dclk.c

+0 −1
Original line number Diff line number Diff line
@@ -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>