renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-11-19 08:05:27 +08:00
Code

[ARM] Include asm/hardware.h instead of asm/arch/hardware.h

Browse Source 
Rationalise hardware.h include.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Russell King 2005-11-16 14:51:20 +00:00 committed by Russell King
parent ce07d90aa8
commit 0a5709b2dc
19 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-pxa/corgi_lcd.c
View File

@ -22,7 +22,7 @@
#include <linux/string.h> #include <linux/string.h>
#include <asm/arch/akita.h> #include <asm/arch/akita.h>
#include <asm/arch/corgi.h> #include <asm/arch/corgi.h>
#include <asm/arch/hardware.h> #include <asm/hardware.h>
#include <asm/arch/pxa-regs.h> #include <asm/arch/pxa-regs.h>
#include <asm/arch/sharpsl.h> #include <asm/arch/sharpsl.h>
#include <asm/arch/spitz.h> #include <asm/arch/spitz.h>

2
arch/arm/plat-omap/dmtimer.c
View File

@ -26,7 +26,7 @@
*/ */
#include <linux/init.h> #include <linux/init.h>
#include <asm/arch/hardware.h> #include <asm/hardware.h>
#include <asm/arch/dmtimer.h> #include <asm/arch/dmtimer.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/irqs.h> #include <asm/arch/irqs.h>

2
arch/arm/plat-omap/ocpi.c
View File

@ -34,7 +34,7 @@
#include <asm/io.h> #include <asm/io.h>
#include <asm/hardware/clock.h> #include <asm/hardware/clock.h>
#include <asm/arch/hardware.h> #include <asm/hardware.h>
#define OCPI_BASE 0xfffec320 #define OCPI_BASE 0xfffec320
#define OCPI_FAULT (OCPI_BASE + 0x00) #define OCPI_FAULT (OCPI_BASE + 0x00)

2
arch/arm/plat-omap/pm.c
View File

@ -509,7 +509,7 @@ static void omap_pm_init_proc(void)
* @state: suspend state we're entering. * @state: suspend state we're entering.
* *
*/ */
//#include <asm/arch/hardware.h> //#include <asm/hardware.h>
static int omap_pm_prepare(suspend_state_t state) static int omap_pm_prepare(suspend_state_t state)
{ {

2
arch/arm/plat-omap/sram-fn.S
View File

@ -12,7 +12,7 @@
#include <linux/linkage.h> #include <linux/linkage.h>
#include <asm/assembler.h> #include <asm/assembler.h>
#include <asm/arch/io.h> #include <asm/arch/io.h>
#include <asm/arch/hardware.h> #include <asm/hardware.h>
.text .text

2
include/asm-arm/arch-clps711x/uncompress.h
View File

@ -19,7 +19,7 @@
*/ */
#include <linux/config.h> #include <linux/config.h>
#include <asm/arch/io.h> #include <asm/arch/io.h>
#include <asm/arch/hardware.h> #include <asm/hardware.h>
#include <asm/hardware/clps7111.h> #include <asm/hardware/clps7111.h>
#undef CLPS7111_BASE #undef CLPS7111_BASE

2
include/asm-arm/arch-epxa10db/uncompress.h
View File

@ -19,7 +19,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include "asm/arch/platform.h" #include "asm/arch/platform.h"
#include "asm/arch/hardware.h" #include "asm/hardware.h"
#define UART00_TYPE (volatile unsigned int*) #define UART00_TYPE (volatile unsigned int*)
#include "asm/arch/uart00.h" #include "asm/arch/uart00.h"

2
include/asm-arm/arch-h720x/uncompress.h
View File

@ -7,7 +7,7 @@
#ifndef __ASM_ARCH_UNCOMPRESS_H #ifndef __ASM_ARCH_UNCOMPRESS_H
#define __ASM_ARCH_UNCOMPRESS_H #define __ASM_ARCH_UNCOMPRESS_H
#include <asm/arch/hardware.h> #include <asm/hardware.h>
#define LSR 0x14 #define LSR 0x14
#define TEMPTY 0x40 #define TEMPTY 0x40

2
include/asm-arm/arch-imx/irqs.h
View File

@ -23,7 +23,7 @@
#define __ARM_IRQS_H__ #define __ARM_IRQS_H__
/* Use the imx definitions */ /* Use the imx definitions */
#include <asm/arch/hardware.h> #include <asm/hardware.h>
/* /*
* IMX Interrupt numbers * IMX Interrupt numbers

2
include/asm-arm/arch-imx/timex.h
View File

@ -21,7 +21,7 @@
#ifndef __ASM_ARCH_TIMEX_H #ifndef __ASM_ARCH_TIMEX_H
#define __ASM_ARCH_TIMEX_H #define __ASM_ARCH_TIMEX_H
#include <asm/arch/hardware.h> #include <asm/hardware.h>
#define CLOCK_TICK_RATE (CLK32) #define CLOCK_TICK_RATE (CLK32)
#endif #endif

2
include/asm-arm/arch-integrator/smp.h
View File

@ -3,7 +3,7 @@
#include <linux/config.h> #include <linux/config.h>
#include <asm/arch/hardware.h> #include <asm/hardware.h>
#include <asm/io.h> #include <asm/io.h>
#define hard_smp_processor_id() \ #define hard_smp_processor_id() \

2
include/asm-arm/arch-l7200/aux_reg.h
View File

@ -9,7 +9,7 @@
#ifndef _ASM_ARCH_AUXREG_H #ifndef _ASM_ARCH_AUXREG_H
#define _ASM_ARCH_AUXREG_H #define _ASM_ARCH_AUXREG_H
#include <asm/arch/hardware.h> #include <asm/hardware.h>
#define l7200aux_reg *((volatile unsigned int *) (AUX_BASE)) #define l7200aux_reg *((volatile unsigned int *) (AUX_BASE))

2
include/asm-arm/arch-l7200/gp_timers.h
View File

@ -10,7 +10,7 @@
#ifndef _ASM_ARCH_GPTIMERS_H #ifndef _ASM_ARCH_GPTIMERS_H
#define _ASM_ARCH_GPTIMERS_H #define _ASM_ARCH_GPTIMERS_H
#include <asm/arch/hardware.h> #include <asm/hardware.h>
/* /*
* Layout of L7200 general purpose timer registers * Layout of L7200 general purpose timer registers

2
include/asm-arm/arch-omap/gpio.h
View File

@ -26,7 +26,7 @@
#ifndef __ASM_ARCH_OMAP_GPIO_H #ifndef __ASM_ARCH_OMAP_GPIO_H
#define __ASM_ARCH_OMAP_GPIO_H #define __ASM_ARCH_OMAP_GPIO_H
#include <asm/arch/hardware.h> #include <asm/hardware.h>
#include <asm/arch/irqs.h> #include <asm/arch/irqs.h>
#include <asm/io.h> #include <asm/io.h>

2
include/asm-arm/arch-omap/irqs.h
View File

@ -260,7 +260,7 @@ extern void omap_init_irq(void);
* The definition of NR_IRQS is in board-specific header file, which is * The definition of NR_IRQS is in board-specific header file, which is
* included via hardware.h * included via hardware.h
*/ */
#include <asm/arch/hardware.h> #include <asm/hardware.h>
#ifndef NR_IRQS #ifndef NR_IRQS
#define NR_IRQS IH_BOARD_BASE #define NR_IRQS IH_BOARD_BASE

2
include/asm-arm/arch-omap/mcbsp.h
View File

@ -24,7 +24,7 @@
#ifndef __ASM_ARCH_OMAP_MCBSP_H #ifndef __ASM_ARCH_OMAP_MCBSP_H
#define __ASM_ARCH_OMAP_MCBSP_H #define __ASM_ARCH_OMAP_MCBSP_H
#include <asm/arch/hardware.h> #include <asm/hardware.h>
#define OMAP730_MCBSP1_BASE 0xfffb1000 #define OMAP730_MCBSP1_BASE 0xfffb1000
#define OMAP730_MCBSP2_BASE 0xfffb1800 #define OMAP730_MCBSP2_BASE 0xfffb1800

2
include/asm-arm/arch-omap/system.h
View File

@ -7,7 +7,7 @@
#include <linux/config.h> #include <linux/config.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/hardware/clock.h> #include <asm/hardware/clock.h>
#include <asm/arch/hardware.h> #include <asm/hardware.h>
#include <asm/arch/prcm.h> #include <asm/arch/prcm.h>
#ifndef CONFIG_MACH_VOICEBLUE #ifndef CONFIG_MACH_VOICEBLUE

2
include/asm-arm/arch-rpc/system.h
View File

@ -7,7 +7,7 @@
* it under the terms of the GNU General Public License version 2 as * it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation. * published by the Free Software Foundation.
*/ */
#include <asm/arch/hardware.h> #include <asm/hardware.h>
#include <asm/hardware/iomd.h> #include <asm/hardware/iomd.h>
#include <asm/io.h> #include <asm/io.h>

2
include/asm-arm/hardware/dec21285.h
View File

@ -20,7 +20,7 @@
#include <linux/config.h> #include <linux/config.h>
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
#include <asm/arch/hardware.h> #include <asm/hardware.h>
#define DC21285_IO(x) ((volatile unsigned long *)(ARMCSR_BASE+(x))) #define DC21285_IO(x) ((volatile unsigned long *)(ARMCSR_BASE+(x)))
#else #else
#define DC21285_IO(x) (x) #define DC21285_IO(x) (x)