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

Commit 6b8b0cb4 authored by Magnus Damm's avatar Magnus Damm Committed by Simon Horman
Browse files

ARM: shmobile: Move pm-rmobile.h, cleanup sh73xx.h 



Change location of pm-rmobile.h so it can be used as #include "pm-rmobile.h"
instead of the old style #include <mach/pm-rmobile.h>. Also clean up
the sh7372 and sh73a0 header files to get rid of unused include files.

Signed-off-by: default avatarMagnus Damm <damm+renesas@opensource.se>
Acked-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent fd44aa5e

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

+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ 
#include <sound/simple_card.h>

#include "common.h"

#include "irqs.h"

#include "pm-rmobile.h"

#include "sh-gpio.h"



/*

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

+2 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ 
#include <linux/regulator/fixed.h>

#include <linux/regulator/machine.h>

#include <linux/smsc911x.h>

#include <linux/sh_clk.h>

#include <linux/tca6416_keypad.h>

#include <linux/usb/renesas_usbhs.h>

#include <linux/dma-mapping.h>
@@ -62,6 +63,7 @@ 
#include <asm/mach-types.h>

#include "common.h"

#include "irqs.h"

#include "pm-rmobile.h"

#include "sh-gpio.h"



/*

arch/arm/mach-shmobile/include/mach/r8a7740.h

+0 −2
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ 
#ifndef __ASM_R8A7740_H__

#define __ASM_R8A7740_H__



#include <mach/pm-rmobile.h>



/*

 * MD_CKx pin

 */

arch/arm/mach-shmobile/include/mach/sh7372.h

+0 −4
Original line number Diff line number Diff line
@@ -11,10 +11,6 @@ 
#ifndef __ASM_SH7372_H__

#define __ASM_SH7372_H__



#include <linux/sh_clk.h>

#include <linux/pm_domain.h>

#include <mach/pm-rmobile.h>



/* DMA slave IDs */

enum {

	SHDMA_SLAVE_INVALID,

arch/arm/mach-shmobile/pm-r8a7740.c

+1 −1
Original line number Diff line number Diff line
@@ -10,8 +10,8 @@ 
 */

#include <linux/console.h>

#include <linux/suspend.h>

#include <mach/pm-rmobile.h>

#include "common.h"

#include "pm-rmobile.h"



#ifdef CONFIG_PM

static int r8a7740_pd_a4s_suspend(void)