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

Commit 64460c7e authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'renesas-header-cleanup-for-v3.17' of... 

Merge tag 'renesas-header-cleanup-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/cleanup

Merge "Renesas ARM Based SoC Header Cleanup for v3.17" from Simon Horman:

Move the most common shared header files for mach-shmobile
from <mach/foobar.h> to "foobar.h"

* tag 'renesas-header-cleanup-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

:
  ARM: shmobile: Move rcar-gen2.h, cleanup r8a7790 case
  ARM: shmobile: Move pm-rcar.h, cleanup r8a7779 case
  ARM: shmobile: Move pm-rmobile.h, cleanup sh73xx.h
  ARM: shmobile: Move common.h
  ARM: shmobile: Move most of irqs.h, keep some for pinctl
  ARM: shmobile: Move clock.h
  ARM: shmobile: Move dma-register.h
  ARM: shmobile: Move intc.h, cleanup sh_intc.h usage

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 402277e0 62872989

arch/arm/mach-shmobile/board-ape6evm-reference.c

+1 −1
Original line number Diff line number Diff line
@@ -24,10 +24,10 @@ 
#include <linux/pinctrl/machine.h>

#include <linux/platform_device.h>

#include <linux/sh_clk.h>

#include <mach/common.h>

#include <mach/r8a73a4.h>

#include <asm/mach-types.h>

#include <asm/mach/arch.h>

#include "common.h"



static void __init ape6evm_add_standard_devices(void)

{

arch/arm/mach-shmobile/board-ape6evm.c

+2 −2
Original line number Diff line number Diff line
@@ -33,11 +33,11 @@ 
#include <linux/regulator/machine.h>

#include <linux/sh_clk.h>

#include <linux/smsc911x.h>

#include <mach/common.h>

#include <mach/irqs.h>

#include <mach/r8a73a4.h>

#include <asm/mach-types.h>

#include <asm/mach/arch.h>

#include "common.h"

#include "irqs.h"



/* LEDS */

static struct gpio_led ape6evm_leds[] = {

arch/arm/mach-shmobile/board-armadillo800eva-reference.c

+1 −1
Original line number Diff line number Diff line
@@ -24,10 +24,10 @@ 
#include <linux/kernel.h>

#include <linux/gpio.h>

#include <linux/io.h>

#include <mach/common.h>

#include <mach/r8a7740.h>

#include <asm/mach/arch.h>

#include <asm/hardware/cache-l2x0.h>

#include "common.h"



/*

 * CON1		Camera Module

arch/arm/mach-shmobile/board-armadillo800eva.c

+3 −3
Original line number Diff line number Diff line
@@ -45,8 +45,6 @@ 
#include <linux/mmc/sh_mobile_sdhi.h>

#include <linux/i2c-gpio.h>

#include <linux/reboot.h>

#include <mach/common.h>

#include <mach/irqs.h>

#include <mach/r8a7740.h>

#include <media/mt9t112.h>

#include <media/sh_mobile_ceu.h>
@@ -61,7 +59,9 @@ 
#include <video/sh_mobile_hdmi.h>

#include <sound/sh_fsi.h>

#include <sound/simple_card.h>



#include "common.h"

#include "irqs.h"

#include "pm-rmobile.h"

#include "sh-gpio.h"



/*

arch/arm/mach-shmobile/board-bockw-reference.c

+1 −1
Original line number Diff line number Diff line
@@ -19,9 +19,9 @@ 
 */



#include <linux/of_platform.h>

#include <mach/common.h>

#include <mach/r8a7778.h>

#include <asm/mach/arch.h>

#include "common.h"



/*

 *	see board-bock.c for checking detail of dip-switch