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

Commit 3cdb59d7 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'next/cleanup-s3c' of... 

Merge branch 'next/cleanup-s3c' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup

From Kukjin Kim <kgene.kim@samsung.com>:

Cleanups for the Samsung S3C24XX platforms.

* 'next/cleanup-s3c' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung

:
  ARM: S3C24XX: cleanup the included soc init functions in common.h
  ARM: S3C24XX: move plat-samsung/s3c24XX headers to local common.h
  ARM: S3C24XX: remove plat/irq.h in plat-samsung
  ARM: S3C24XX: plat/common-smdk.h local
  mmc: s3cmci: moved mach/regs-sdi.h into s3cmci device driver

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents f6161aa1 7488335d

arch/arm/mach-s3c24xx/bast-irq.c

+0 −2
Original line number Diff line number Diff line
@@ -34,8 +34,6 @@ 
#include <mach/hardware.h>

#include <mach/regs-irq.h>



#include <plat/irq.h>



#include "bast.h"



#define irqdbf(x...)

arch/arm/mach-s3c24xx/clock-s3c2410.c

+0 −1
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ 
#include <mach/regs-clock.h>

#include <mach/regs-gpio.h>



#include <plat/s3c2410.h>

#include <plat/clock.h>

#include <plat/cpu.h>

arch/arm/mach-s3c24xx/clock-s3c2412.c

+0 −1
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ 
#include <mach/regs-clock.h>

#include <mach/regs-gpio.h>



#include <plat/s3c2412.h>

#include <plat/clock.h>

#include <plat/cpu.h>

arch/arm/mach-s3c24xx/clock-s3c2416.c

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 
#include <linux/init.h>

#include <linux/clk.h>



#include <plat/s3c2416.h>

#include <plat/clock.h>

#include <plat/clock-clksrc.h>

#include <plat/cpu.h>

arch/arm/mach-s3c24xx/clock-s3c2443.c

+0 −1
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ 


#include <plat/cpu-freq.h>



#include <plat/s3c2443.h>

#include <plat/clock.h>

#include <plat/clock-clksrc.h>

#include <plat/cpu.h>