korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-26 05:34:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'for-linus-merged' of master.kernel.org:/home/rmk/linux-2.6-arm

Browse Source 
* 'for-linus-merged' of master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 5177/1: arm/mach-sa1100/Makefile: remove CONFIG_SA1100_USB
  [ARM] 5166/1: magician: add MAINTAINERS entry
  [ARM] fix pnx4008 build errors
  [ARM] Fix SMP booting with non-zero PHYS_OFFSET
  [ARM] 5185/1: Fix spi num_chipselect for lubbock
  [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach
  [ARM] Add support for arch/arm/mach-*/include and arch/arm/plat-*/include
  [ARM] Remove asm/hardware.h, use asm/arch/hardware.h instead
  [ARM] Eliminate useless includes of asm/mach-types.h
  [ARM] Fix circular include dependency with IRQ headers
  avr32: Use <mach/foo.h> instead of <asm/arch/foo.h>
  avr32: Introduce arch/avr32/mach-*/include/mach
  avr32: Move include/asm-avr32 to arch/avr32/include/asm
  [ARM] sa1100_wdt: use reset_status to remember watchdog reset status
  [ARM] pxa: introduce reset_status and clear_reset_status for driver's usage
  [ARM] pxa: introduce reset.h for reset specific header information
This commit is contained in:
Linus Torvalds 2008-08-08 11:38:42 -07:00
commit 49b75b87ce
1722 changed files with 3739 additions and 3194 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/arm/IXP4xx
View File

@ -32,7 +32,7 @@ Linux currently supports the following features on the IXP4xx chips:
- Flash access (MTD/JFFS)
- I2C through GPIO on IXP42x
- GPIO for input/output/interrupts
See include/asm-arm/arch-ixp4xx/platform.h for access functions.
See arch/arm/mach-ixp4xx/include/mach/platform.h for access functions.
- Timers (watchdog, OS)
The following components of the chips are not supported by Linux and

2
Documentation/arm/Interrupts
View File

@ -158,7 +158,7 @@ So, what's changed?
be re-checked for pending events. (see the Neponset IRQ handler for
details).
7. fixup_irq() is gone, as is include/asm-arm/arch-*/irq.h
7. fixup_irq() is gone, as is arch/arm/mach-*/include/mach/irq.h
Please note that this will not solve all problems - some of them are
hardware based. Mixing level-based and edge-based IRQs on the same

4
Documentation/arm/README
View File

@ -79,7 +79,7 @@ Machine/Platform support
To this end, we now have arch/arm/mach-$(MACHINE) directories which are
designed to house the non-driver files for a particular machine (eg, PCI,
memory management, architecture definitions etc). For all future
machines, there should be a corresponding include/asm-arm/arch-$(MACHINE)
machines, there should be a corresponding arch/arm/mach-$(MACHINE)/include/mach
directory.
@ -176,7 +176,7 @@ Kernel entry (head.S)
class typically based around one or more system on a chip devices, and
acts as a natural container around the actual implementations. These
classes are given directories - arch/arm/mach-<class> and
include/asm-arm/arch-<class> - which contain the source files to
arch/arm/mach-<class> - which contain the source files to/include/mach
support the machine class. This directories also contain any machine
specific supporting code.

8
Documentation/arm/Samsung-S3C24XX/GPIO.txt
View File

@ -16,13 +16,13 @@ Introduction
Headers
-------
See include/asm-arm/arch-s3c2410/regs-gpio.h for the list
See arch/arm/mach-s3c2410/include/mach/regs-gpio.h for the list
of GPIO pins, and the configuration values for them. This
is included by using #include <asm/arch/regs-gpio.h>
is included by using #include <mach/regs-gpio.h>
The GPIO management functions are defined in the hardware
header include/asm-arm/arch-s3c2410/hardware.h which can be
included by #include <asm/arch/hardware.h>
header arch/arm/mach-s3c2410/include/mach/hardware.h which can be
included by #include <mach/hardware.h>
A useful amount of documentation can be found in the hardware
header on how the GPIO functions (and others) work.

2
Documentation/arm/Samsung-S3C24XX/Overview.txt
View File

@ -36,7 +36,7 @@ Layout
in arch/arm/mach-s3c2410 and S3C2440 in arch/arm/mach-s3c2440
Register, kernel and platform data definitions are held in the
include/asm-arm/arch-s3c2410 directory.
arch/arm/mach-s3c2410 directory./include/mach
Machines

2
Documentation/arm/Samsung-S3C24XX/USB-Host.txt
View File

@ -49,7 +49,7 @@ Board Support
Platform Data
-------------
See linux/include/asm-arm/arch-s3c2410/usb-control.h for the
See arch/arm/mach-s3c2410/include/mach/usb-control.h for the
descriptions of the platform device data. An implementation
can be found in linux/arch/arm/mach-s3c2410/usb-simtec.c .

4
Documentation/spi/pxa2xx
View File

@ -19,7 +19,7 @@ Declaring PXA2xx Master Controllers
-----------------------------------
Typically a SPI master is defined in the arch/.../mach-*/board-*.c as a
"platform device". The master configuration is passed to the driver via a table
found in include/asm-arm/arch-pxa/pxa2xx_spi.h:
found in arch/arm/mach-pxa/include/mach/pxa2xx_spi.h:
struct pxa2xx_spi_master {
enum pxa_ssp_type ssp_type;
@ -94,7 +94,7 @@ using the "spi_board_info" structure found in "linux/spi/spi.h". See
Each slave device attached to the PXA must provide slave specific configuration
information via the structure "pxa2xx_spi_chip" found in
"include/asm-arm/arch-pxa/pxa2xx_spi.h". The pxa2xx_spi master controller driver
"arch/arm/mach-pxa/include/mach/pxa2xx_spi.h". The pxa2xx_spi master controller driver
will uses the configuration whenever the driver communicates with the slave
device.

4
Documentation/spi/spi-summary
View File

@ -210,7 +210,7 @@ board should normally be set up and registered.
So for example arch/.../mach-*/board-*.c files might have code like:
#include <asm/arch/spi.h> /* for mysoc_spi_data */
#include <mach/spi.h> /* for mysoc_spi_data */
/* if your mach-* infrastructure doesn't support kernels that can
* run on multiple boards, pdata wouldn't benefit from "__init".
@ -227,7 +227,7 @@ So for example arch/.../mach-*/board-*.c files might have code like:
And SOC-specific utility code might look something like:
#include <asm/arch/spi.h>
#include <mach/spi.h>
static struct platform_device spi2 = { ... };

5
MAINTAINERS
View File

@ -594,6 +594,11 @@ M: kernel@wantstofly.org
L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
S: Maintained
ARM/MAGICIAN MACHINE SUPPORT
P: Philipp Zabel
M: philipp.zabel@gmail.com
S: Maintained
ARM/TOSA MACHINE SUPPORT
P: Dmitry Baryshkov
M: dbaryshkov@gmail.com

54
arch/arm/Makefile
View File

@ -97,9 +97,7 @@ textofs-y := 0x00008000
machine-$(CONFIG_ARCH_RPC) := rpc
machine-$(CONFIG_ARCH_EBSA110) := ebsa110
machine-$(CONFIG_ARCH_CLPS7500) := clps7500
incdir-$(CONFIG_ARCH_CLPS7500) := cl7500
machine-$(CONFIG_FOOTBRIDGE) := footbridge
incdir-$(CONFIG_FOOTBRIDGE) := ebsa285
machine-$(CONFIG_ARCH_SHARK) := shark
machine-$(CONFIG_ARCH_SA1100) := sa1100
ifeq ($(CONFIG_ARCH_SA1100),y)
@ -114,13 +112,15 @@ endif
machine-$(CONFIG_ARCH_IOP32X) := iop32x
machine-$(CONFIG_ARCH_IOP33X) := iop33x
machine-$(CONFIG_ARCH_IOP13XX) := iop13xx
plat-$(CONFIG_PLAT_IOP) := iop
machine-$(CONFIG_ARCH_IXP4XX) := ixp4xx
machine-$(CONFIG_ARCH_IXP2000) := ixp2000
machine-$(CONFIG_ARCH_IXP23XX) := ixp23xx
machine-$(CONFIG_ARCH_OMAP1) := omap1
machine-$(CONFIG_ARCH_OMAP2) := omap2
incdir-$(CONFIG_ARCH_OMAP) := omap
machine-$(CONFIG_ARCH_S3C2410) := s3c2410
plat-$(CONFIG_ARCH_OMAP) := omap
machine-$(CONFIG_ARCH_S3C2410) := s3c2410 s3c2400 s3c2412 s3c2440 s3c2442 s3c2443
plat-$(CONFIG_PLAT_S3C24XX) := s3c24xx
machine-$(CONFIG_ARCH_LH7A40X) := lh7a40x
machine-$(CONFIG_ARCH_VERSATILE) := versatile
machine-$(CONFIG_ARCH_IMX) := imx
@ -135,10 +135,11 @@ endif
machine-$(CONFIG_ARCH_DAVINCI) := davinci
machine-$(CONFIG_ARCH_KIRKWOOD) := kirkwood
machine-$(CONFIG_ARCH_KS8695) := ks8695
incdir-$(CONFIG_ARCH_MXC) := mxc
plat-$(CONFIG_ARCH_MXC) := mxc
machine-$(CONFIG_ARCH_MX2) := mx2
machine-$(CONFIG_ARCH_MX3) := mx3
machine-$(CONFIG_ARCH_ORION5X) := orion5x
plat-$(CONFIG_PLAT_ORION) := orion
machine-$(CONFIG_ARCH_MSM7X00A) := msm
machine-$(CONFIG_ARCH_LOKI) := loki
machine-$(CONFIG_ARCH_MV78XX0) := mv78xx0
@ -153,17 +154,22 @@ endif
# The byte offset of the kernel image in RAM from the start of RAM.
TEXT_OFFSET := $(textofs-y)
ifeq ($(incdir-y),)
incdir-y := $(machine-y)
endif
INCDIR := arch-$(incdir-y)
# The first directory contains additional information for the boot setup code
ifneq ($(machine-y),)
MACHINE := arch/arm/mach-$(machine-y)/
MACHINE := arch/arm/mach-$(word 1,$(machine-y))/
else
MACHINE :=
endif
machdirs := $(patsubst %,arch/arm/mach-%/,$(machine-y))
platdirs := $(patsubst %,arch/arm/plat-%/,$(plat-y))
ifeq ($(KBUILD_SRC),)
KBUILD_CPPFLAGS += $(patsubst %,-I%include,$(machdirs) $(platdirs))
else
KBUILD_CPPFLAGS += $(patsubst %,-I$(srctree)/%include,$(machdirs) $(platdirs))
endif
export TEXT_OFFSET GZFLAGS MMUEXT
# Do we have FASTFPE?
@ -174,23 +180,11 @@ endif
# If we have a machine-specific directory, then include it in the build.
core-y += arch/arm/kernel/ arch/arm/mm/ arch/arm/common/
core-y += $(MACHINE)
core-$(CONFIG_ARCH_S3C2410) += arch/arm/mach-s3c2400/
core-$(CONFIG_ARCH_S3C2410) += arch/arm/mach-s3c2412/
core-$(CONFIG_ARCH_S3C2410) += arch/arm/mach-s3c2440/
core-$(CONFIG_ARCH_S3C2410) += arch/arm/mach-s3c2442/
core-$(CONFIG_ARCH_S3C2410) += arch/arm/mach-s3c2443/
core-y += $(machdirs) $(platdirs)
core-$(CONFIG_FPE_NWFPE) += arch/arm/nwfpe/
core-$(CONFIG_FPE_FASTFPE) += $(FASTFPE_OBJ)
core-$(CONFIG_VFP) += arch/arm/vfp/
# If we have a common platform directory, then include it in the build.
core-$(CONFIG_PLAT_IOP) += arch/arm/plat-iop/
core-$(CONFIG_PLAT_ORION) += arch/arm/plat-orion/
core-$(CONFIG_ARCH_OMAP) += arch/arm/plat-omap/
core-$(CONFIG_PLAT_S3C24XX) += arch/arm/plat-s3c24xx/
core-$(CONFIG_ARCH_MXC) += arch/arm/plat-mxc/
drivers-$(CONFIG_OPROFILE) += arch/arm/oprofile/
libs-y := arch/arm/lib/ $(libs-y)
@ -210,20 +204,10 @@ boot := arch/arm/boot
# them changed. We use .arch to indicate when they were updated
# last, otherwise make uses the target directory mtime.
include/asm-arm/.arch: $(wildcard include/config/arch/*.h) include/config/auto.conf
@echo ' SYMLINK include/asm-arm/arch -> include/asm-arm/$(INCDIR)'
ifneq ($(KBUILD_SRC),)
$(Q)mkdir -p include/asm-arm
$(Q)ln -fsn $(srctree)/include/asm-arm/$(INCDIR) include/asm-arm/arch
else
$(Q)ln -fsn $(INCDIR) include/asm-arm/arch
endif
@touch $@
archprepare: maketools
PHONY += maketools FORCE
maketools: include/linux/version.h include/asm-arm/.arch FORCE
maketools: include/linux/version.h FORCE
$(Q)$(MAKE) $(build)=arch/arm/tools include/asm-arm/mach-types.h
# Convert bzImage to zImage

1
arch/arm/boot/compressed/head-xscale.S
View File

@ -6,7 +6,6 @@
*/
#include <linux/linkage.h>
#include <asm/mach-types.h>
.section ".start", "ax"

2
arch/arm/boot/compressed/head.S
View File

@ -37,7 +37,7 @@
#else
#include <asm/arch/debug-macro.S>
#include <mach/debug-macro.S>
.macro writeb, ch, rb
senduart \ch, \rb

2
arch/arm/boot/compressed/misc.c
View File

@ -27,7 +27,7 @@ unsigned int __machine_arch_type;
static void putstr(const char *ptr);
#include <linux/compiler.h>
#include <asm/arch/uncompress.h>
#include <mach/uncompress.h>
#ifdef CONFIG_DEBUG_ICEDCC

2
arch/arm/common/locomo.c
View File

@ -25,7 +25,7 @@
#include <linux/slab.h>
#include <linux/spinlock.h>
#include <asm/hardware.h>
#include <mach/hardware.h>
#include <asm/io.h>
#include <asm/irq.h>
#include <asm/mach/irq.h>

2
arch/arm/common/sa1111.c
View File

@ -26,7 +26,7 @@
#include <linux/dma-mapping.h>
#include <linux/clk.h>
#include <asm/hardware.h>
#include <mach/hardware.h>
#include <asm/mach-types.h>
#include <asm/io.h>
#include <asm/irq.h>

11
arch/arm/common/sharpsl_pm.c
View File

@ -26,13 +26,12 @@
#include <linux/apm-emulation.h>
#include <linux/suspend.h>
#include <asm/hardware.h>
#include <asm/mach-types.h>
#include <mach/hardware.h>
#include <asm/irq.h>
#include <asm/arch/pm.h>
#include <asm/arch/pxa-regs.h>
#include <asm/arch/pxa2xx-regs.h>
#include <asm/arch/sharpsl.h>
#include <mach/pm.h>
#include <mach/pxa-regs.h>
#include <mach/pxa2xx-regs.h>
#include <mach/sharpsl.h>
#include <asm/hardware/sharpsl_pm.h>
/*

2
arch/arm/common/time-acorn.c
View File

@ -18,7 +18,7 @@
#include <linux/interrupt.h>
#include <linux/irq.h>
#include <asm/hardware.h>
#include <mach/hardware.h>
#include <asm/io.h>
#include <asm/hardware/ioc.h>

3
arch/arm/common/uengine.c
View File

@ -16,8 +16,7 @@
#include <linux/slab.h>
#include <linux/module.h>
#include <linux/string.h>
#include <asm/hardware.h>
#include <asm/arch/hardware.h>
#include <mach/hardware.h>
#include <asm/hardware/uengine.h>
#include <asm/io.h>

2
arch/arm/include/asm/dma.h
View File

@ -6,7 +6,7 @@ typedef unsigned int dmach_t;
#include <linux/spinlock.h>
#include <asm/system.h>
#include <asm/scatterlist.h>
#include <asm/arch/dma.h>
#include <mach/dma.h>
/*
* This is the maximum virtual address which can be DMA'd from.

2
arch/arm/include/asm/floppy.h
View File

@ -12,7 +12,7 @@
#ifndef __ASM_ARM_FLOPPY_H
#define __ASM_ARM_FLOPPY_H
#if 0
#include <asm/arch/floppy.h>
#include <mach/floppy.h>
#endif
#define fd_outb(val,port) \

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

@ -2,6 +2,6 @@
#define _ARCH_ARM_GPIO_H
/* not all ARM platforms necessarily support this API ... */
#include <asm/arch/gpio.h>
#include <mach/gpio.h>
#endif /* _ARCH_ARM_GPIO_H */

18
arch/arm/include/asm/hardware.h
View File

@ -1,18 +0,0 @@
/*
* arch/arm/include/asm/hardware.h
*
* Copyright (C) 1996 Russell King
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*
* Common hardware definitions
*/
#ifndef __ASM_HARDWARE_H
#define __ASM_HARDWARE_H
#include <asm/arch/hardware.h>
#endif

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

@ -19,7 +19,7 @@
#define DC21285_PCI_MEM 0x80000000
#ifndef __ASSEMBLY__
#include <asm/hardware.h>
#include <mach/hardware.h>
#define DC21285_IO(x) ((volatile unsigned long *)(ARMCSR_BASE+(x)))
#else
#define DC21285_IO(x) (x)

2
arch/arm/include/asm/hardware/iop3xx-adma.h
View File

@ -19,7 +19,7 @@
#define _ADMA_H
#include <linux/types.h>
#include <linux/io.h>
#include <asm/hardware.h>
#include <mach/hardware.h>
#include <asm/hardware/iop_adma.h>
/* Memory copy units */

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

@ -25,7 +25,7 @@
#ifndef __ASM_ARM_HARDWARE_IOP3XX_GPIO_H
#define __ASM_ARM_HARDWARE_IOP3XX_GPIO_H
#include <asm/hardware.h>
#include <mach/hardware.h>
#include <asm-generic/gpio.h>
#define IOP3XX_N_GPIOS 8

2
arch/arm/include/asm/hardware/sa1111.h
View File

@ -12,7 +12,7 @@
#ifndef _ASM_ARCH_SA1111
#define _ASM_ARCH_SA1111
#include <asm/arch/bitfield.h>
#include <mach/bitfield.h>
/*
* The SA1111 is always located at virtual 0xf4000000, and is always

20
arch/arm/include/asm/hw_irq.h
View File

@ -4,6 +4,24 @@
#ifndef _ARCH_ARM_HW_IRQ_H
#define _ARCH_ARM_HW_IRQ_H
#include <asm/mach/irq.h>
static inline void ack_bad_irq(int irq)
{
extern unsigned long irq_err_count;
irq_err_count++;
}
/*
* Obsolete inline function for calling irq descriptor handlers.
*/
static inline void desc_handle_irq(unsigned int irq, struct irq_desc *desc)
{
desc->handle_irq(irq, desc);
}
void set_irq_flags(unsigned int irq, unsigned int flags);
#define IRQF_VALID (1 << 0)
#define IRQF_PROBE (1 << 1)
#define IRQF_NOAUTOEN (1 << 2)
#endif

2
arch/arm/include/asm/io.h
View File

@ -82,7 +82,7 @@ extern void __readwrite_bug(const char *fn);
/*
* Now, pick up the machine-defined IO definitions
*/
#include <asm/arch/io.h>
#include <mach/io.h>
/*
* IO port access primitives

2
arch/arm/include/asm/irq.h
View File

@ -1,7 +1,7 @@
#ifndef __ASM_ARM_IRQ_H
#define __ASM_ARM_IRQ_H
#include <asm/arch/irqs.h>
#include <mach/irqs.h>
#ifndef irq_canonicalize
#define irq_canonicalize(i) (i)

20
arch/arm/include/asm/mach/irq.h
View File

@ -21,20 +21,6 @@ extern void (*init_arch_irq)(void);
extern void init_FIQ(void);
extern int show_fiq_list(struct seq_file *, void *);
/*
* Obsolete inline function for calling irq descriptor handlers.
*/
static inline void desc_handle_irq(unsigned int irq, struct irq_desc *desc)
{
desc->handle_irq(irq, desc);
}
void set_irq_flags(unsigned int irq, unsigned int flags);
#define IRQF_VALID (1 << 0)
#define IRQF_PROBE (1 << 1)
#define IRQF_NOAUTOEN (1 << 2)
/*
* This is for easy migration, but should be changed in the source
*/
@ -45,10 +31,4 @@ do { \
spin_unlock(&desc->lock); \
} while(0)
extern unsigned long irq_err_count;
static inline void ack_bad_irq(int irq)
{
irq_err_count++;
}
#endif

2
arch/arm/include/asm/mc146818rtc.h
View File

@ -4,7 +4,7 @@
#ifndef _ASM_MC146818RTC_H
#define _ASM_MC146818RTC_H
#include <asm/arch/irqs.h>
#include <mach/irqs.h>
#include <asm/io.h>
#ifndef RTC_PORT

2
arch/arm/include/asm/memory.h
View File

@ -24,7 +24,7 @@
#endif
#include <linux/compiler.h>
#include <asm/arch/memory.h>
#include <mach/memory.h>
#include <asm/sizes.h>
#ifdef CONFIG_MMU

2
arch/arm/include/asm/mmzone.h
View File

@ -25,6 +25,6 @@ extern pg_data_t discontig_node_data[];
*/
#define NODE_MEM_MAP(nid) (NODE_DATA(nid)->node_mem_map)
#include <asm/arch/memory.h>
#include <mach/memory.h>
#endif

4
arch/arm/include/asm/mtd-xip.h
View File

@ -17,8 +17,8 @@
#ifndef __ARM_MTD_XIP_H__
#define __ARM_MTD_XIP_H__
#include <asm/hardware.h>
#include <asm/arch/mtd-xip.h>
#include <mach/hardware.h>
#include <mach/mtd-xip.h>
/* fill instruction prefetch */
#define xip_iprefetch() do { asm volatile (".rep 8; nop; .endr"); } while (0)

2
arch/arm/include/asm/pci.h
View File

@ -4,7 +4,7 @@
#ifdef __KERNEL__
#include <asm-generic/pci-dma-compat.h>
#include <asm/hardware.h> /* for PCIBIOS_MIN_* */
#include <mach/hardware.h> /* for PCIBIOS_MIN_* */
#define pcibios_scan_all_fns(a, b) 0

2
arch/arm/include/asm/pgtable.h
View File

@ -20,7 +20,7 @@
#else
#include <asm/memory.h>
#include <asm/arch/vmalloc.h>
#include <mach/vmalloc.h>
#include <asm/pgtable-hwdef.h>
/*

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

@ -14,7 +14,7 @@
#include <linux/cpumask.h>
#include <linux/thread_info.h>
#include <asm/arch/smp.h>
#include <mach/smp.h>
#ifndef CONFIG_SMP
# error "<asm/smp.h> included in non-SMP build"

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

@ -12,7 +12,7 @@
#ifndef _ASMARM_TIMEX_H
#define _ASMARM_TIMEX_H
#include <asm/arch/timex.h>
#include <mach/timex.h>
typedef unsigned long cycles_t;

2
arch/arm/include/asm/vga.h
View File

@ -1,7 +1,7 @@
#ifndef ASMARM_VGA_H
#define ASMARM_VGA_H
#include <asm/hardware.h>
#include <mach/hardware.h>
#include <asm/io.h>
#define VGA_MAP_MEM(x,s) (PCIMEM_BASE + (x))

2
arch/arm/kernel/crunch-bits.S
View File

@ -16,7 +16,7 @@
#include <asm/ptrace.h>
#include <asm/thread_info.h>
#include <asm/asm-offsets.h>
#include <asm/arch/ep93xx-regs.h>
#include <mach/ep93xx-regs.h>
/*
* We can't use hex constants here due to a bug in gas.

2
arch/arm/kernel/crunch.c
View File

@ -15,7 +15,7 @@
#include <linux/signal.h>
#include <linux/sched.h>
#include <linux/init.h>
#include <asm/arch/ep93xx-regs.h>
#include <mach/ep93xx-regs.h>
#include <asm/thread_notify.h>
#include <asm/io.h>

2
arch/arm/kernel/debug.S
View File

@ -80,7 +80,7 @@
#endif /* CONFIG_CPU_V6 */
#else
#include <asm/arch/debug-macro.S>
#include <mach/debug-macro.S>
#endif /* CONFIG_DEBUG_ICEDCC */
/*

2
arch/arm/kernel/ecard.c
View File

@ -46,7 +46,7 @@
#include <asm/dma.h>
#include <asm/ecard.h>
#include <asm/hardware.h>
#include <mach/hardware.h>
#include <asm/irq.h>
#include <asm/mmu_context.h>
#include <asm/mach/irq.h>

2
arch/arm/kernel/entry-armv.S
View File

@ -18,7 +18,7 @@
#include <asm/memory.h>
#include <asm/glue.h>
#include <asm/vfpmacros.h>
#include <asm/arch/entry-macro.S>
#include <mach/entry-macro.S>
#include <asm/thread_notify.h>
#include "entry-header.S"

2
arch/arm/kernel/entry-common.S
View File

@ -10,7 +10,7 @@
#include <asm/unistd.h>
#include <asm/ftrace.h>
#include <asm/arch/entry-macro.S>
#include <mach/entry-macro.S>
#include "entry-header.S"

1
arch/arm/kernel/head-nommu.S
View File

@ -15,7 +15,6 @@
#include <linux/init.h>
#include <asm/assembler.h>
#include <asm/mach-types.h>
#include <asm/ptrace.h>
#include <asm/asm-offsets.h>
#include <asm/thread_info.h>

1
arch/arm/kernel/irq.c
View File

@ -38,6 +38,7 @@
#include <linux/proc_fs.h>
#include <asm/system.h>
#include <asm/mach/irq.h>
#include <asm/mach/time.h>
/*

2
arch/arm/kernel/process.c
View File

@ -51,7 +51,7 @@ extern void setup_mm_for_reboot(char mode);
static volatile int hlt_counter;
#include <asm/arch/system.h>
#include <mach/system.h>
void disable_hlt(void)
{

4
arch/arm/kernel/smp.c
View File

@ -100,7 +100,7 @@ int __cpuinit __cpu_up(unsigned int cpu)
* a 1:1 mapping for the physical address of the kernel.
*/
pgd = pgd_alloc(&init_mm);
pmd = pmd_offset(pgd, PHYS_OFFSET);
pmd = pmd_offset(pgd + pgd_index(PHYS_OFFSET), PHYS_OFFSET);
*pmd = __pmd((PHYS_OFFSET & PGDIR_MASK) |
PMD_TYPE_SECT | PMD_SECT_AP_WRITE);
@ -139,7 +139,7 @@ int __cpuinit __cpu_up(unsigned int cpu)
secondary_data.stack = NULL;
secondary_data.pgdir = 0;
*pmd_offset(pgd, PHYS_OFFSET) = __pmd(0);
*pmd = __pmd(0);
pgd_free(&init_mm, pgd);
if (ret) {

2
arch/arm/lib/ecard.S
View File

@ -12,7 +12,7 @@
*/
#include <linux/linkage.h>
#include <asm/assembler.h>
#include <asm/hardware.h>
#include <mach/hardware.h>
#define CPSR2SPSR(rt) \
mrs rt, cpsr; \

2
arch/arm/lib/io-readsw-armv3.S
View File

@ -9,7 +9,7 @@
*/
#include <linux/linkage.h>
#include <asm/assembler.h>
#include <asm/hardware.h>
#include <mach/hardware.h>
.Linsw_bad_alignment:
adr r0, .Linsw_bad_align_msg

2
arch/arm/lib/io-writesw-armv3.S
View File

@ -9,7 +9,7 @@
*/
#include <linux/linkage.h>
#include <asm/assembler.h>
#include <asm/hardware.h>
#include <mach/hardware.h>
.Loutsw_bad_alignment:
adr r0, .Loutsw_bad_align_msg

4
arch/arm/mach-aaec2000/aaed2000.c
View File

@ -20,14 +20,14 @@
#include <asm/setup.h>
#include <asm/memory.h>
#include <asm/mach-types.h>
#include <asm/hardware.h>
#include <mach/hardware.h>
#include <asm/irq.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
#include <asm/mach/irq.h>
#include <asm/arch/aaed2000.h>
#include <mach/aaed2000.h>
#include "core.h"

2
arch/arm/mach-aaec2000/core.c
View File

@ -20,7 +20,7 @@
#include <linux/timex.h>
#include <linux/signal.h>
#include <asm/hardware.h>
#include <mach/hardware.h>
#include <asm/irq.h>
#include <asm/sizes.h>

2
include/asm-arm/arch-aaec2000/aaec2000.h → arch/arm/mach-aaec2000/include/mach/aaec2000.h
View File

@ -1,5 +1,5 @@
/*
* linux/include/asm-arm/arch-aaec2000/aaec2000.h
* arch/arm/mach-aaec2000/include/mach/aaec2000.h
*
* AAEC-2000 registers definition
*

2
include/asm-arm/arch-aaec2000/aaed2000.h → arch/arm/mach-aaec2000/include/mach/aaed2000.h
View File

@ -1,5 +1,5 @@
/*
* linux/include/asm-arm/arch-aaec2000/aaed2000.h
* arch/arm/mach-aaec2000/include/mach/aaed2000.h
*
* AAED-2000 specific bits definition
*

2
include/asm-arm/arch-aaec2000/debug-macro.S → arch/arm/mach-aaec2000/include/mach/debug-macro.S
View File

@ -1,4 +1,4 @@
/* linux/include/asm-arm/arch-aaec2000/debug-macro.S
/* arch/arm/mach-aaec2000/include/mach/debug-macro.S
*
* Debugging macro include header
*

2
include/asm-arm/arch-aaec2000/dma.h → arch/arm/mach-aaec2000/include/mach/dma.h
View File

@ -1,5 +1,5 @@
/*
* linux/include/asm-arm/arch-aaec2000/dma.h
* arch/arm/mach-aaec2000/include/mach/dma.h
*
* Copyright (c) 2005 Nicolas Bellido Y Ortega
*

4
include/asm-arm/arch-aaec2000/entry-macro.S → arch/arm/mach-aaec2000/include/mach/entry-macro.S
View File

@ -1,5 +1,5 @@
/*
* linux/include/asm-arm/arch-aaec2000/entry-macro.S
* arch/arm/mach-aaec2000/include/mach/entry-macro.S
*
* Low-level IRQ helper for aaec-2000 based platforms
*
@ -10,7 +10,7 @@
* published by the Free Software Foundation.
*
*/
#include <asm/arch/irqs.h>
#include <mach/irqs.h>
.macro disable_fiq
.endm

4
include/asm-arm/arch-aaec2000/hardware.h → arch/arm/mach-aaec2000/include/mach/hardware.h
View File

@ -1,5 +1,5 @@
/*
* linux/include/asm-arm/arch-aaec2000/hardware.h
* arch/arm/mach-aaec2000/include/mach/hardware.h
*
* Copyright (c) 2005 Nicolas Bellido Y Ortega
*
@ -12,7 +12,7 @@
#define __ASM_ARCH_HARDWARE_H
#include <asm/sizes.h>
#include <asm/arch/aaec2000.h>
#include <mach/aaec2000.h>
/* The kernel is loaded at physical address 0xf8000000.
* We map the IO space a bit after

4
include/asm-arm/arch-aaec2000/io.h → arch/arm/mach-aaec2000/include/mach/io.h
View File

@ -1,12 +1,12 @@
/*
* linux/include/asm-arm/arch-aaec2000/io.h
* arch/arm/mach-aaec2000/include/mach/io.h
*
* Copied from asm/arch/sa1100/io.h
*/
#ifndef __ASM_ARM_ARCH_IO_H
#define __ASM_ARM_ARCH_IO_H
#include <asm/hardware.h>
#include <mach/hardware.h>
#define IO_SPACE_LIMIT 0xffffffff

2
include/asm-arm/arch-aaec2000/irqs.h → arch/arm/mach-aaec2000/include/mach/irqs.h
View File

@ -1,5 +1,5 @@
/*
* linux/include/asm-arm/arch-aaec2000/irqs.h
* arch/arm/mach-aaec2000/include/mach/irqs.h
*
* Copyright (c) 2005 Nicolas Bellido Y Ortega
*

2
include/asm-arm/arch-aaec2000/memory.h → arch/arm/mach-aaec2000/include/mach/memory.h
View File

@ -1,5 +1,5 @@
/*
* linux/include/asm-arm/arch-aaec2000/memory.h
* arch/arm/mach-aaec2000/include/mach/memory.h
*
* Copyright (c) 2005 Nicolas Bellido Y Ortega
*

2
include/asm-arm/arch-aaec2000/system.h → arch/arm/mach-aaec2000/include/mach/system.h
View File

@ -1,5 +1,5 @@
/*
* linux/include/asm-arm/arch-aaed2000/system.h
* arch/arm/mach-aaed2000/include/mach/system.h
*
* Copyright (c) 2005 Nicolas Bellido Y Ortega
*

2
include/asm-arm/arch-aaec2000/timex.h → arch/arm/mach-aaec2000/include/mach/timex.h
View File

@ -1,5 +1,5 @@
/*
* linux/include/asm-arm/arch-aaec2000/timex.h
* arch/arm/mach-aaec2000/include/mach/timex.h
*
* AAEC-2000 Architecture timex specification
*

2
include/asm-arm/arch-aaec2000/uncompress.h → arch/arm/mach-aaec2000/include/mach/uncompress.h
View File

@ -1,5 +1,5 @@
/*
* linux/include/asm-arm/arch-aaec2000/uncompress.h
* arch/arm/mach-aaec2000/include/mach/uncompress.h
*
* Copyright (c) 2005 Nicolas Bellido Y Ortega
*

2
include/asm-arm/arch-aaec2000/vmalloc.h → arch/arm/mach-aaec2000/include/mach/vmalloc.h
View File

@ -1,5 +1,5 @@
/*
* linux/include/asm-arm/arch-aaec2000/vmalloc.h
* arch/arm/mach-aaec2000/include/mach/vmalloc.h
*
* Copyright (c) 2005 Nicolas Bellido Y Ortega
*

8
arch/arm/mach-at91/at91cap9.c
View File

@ -17,10 +17,10 @@
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
#include <asm/arch/at91cap9.h>
#include <asm/arch/at91_pmc.h>
#include <asm/arch/at91_rstc.h>
#include <asm/arch/at91_shdwc.h>
#include <mach/at91cap9.h>
#include <mach/at91_pmc.h>
#include <mach/at91_rstc.h>
#include <mach/at91_shdwc.h>
#include "generic.h"
#include "clock.h"

10
arch/arm/mach-at91/at91cap9_devices.c
View File

@ -20,11 +20,11 @@
#include <video/atmel_lcdc.h>
#include <asm/arch/board.h>
#include <asm/arch/gpio.h>
#include <asm/arch/at91cap9.h>
#include <asm/arch/at91cap9_matrix.h>
#include <asm/arch/at91sam9_smc.h>
#include <mach/board.h>
#include <mach/gpio.h>
#include <mach/at91cap9.h>
#include <mach/at91cap9_matrix.h>
#include <mach/at91sam9_smc.h>
#include "generic.h"

6
arch/arm/mach-at91/at91rm9200.c
View File

@ -14,9 +14,9 @@
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
#include <asm/arch/at91rm9200.h>
#include <asm/arch/at91_pmc.h>
#include <asm/arch/at91_st.h>
#include <mach/at91rm9200.h>
#include <mach/at91_pmc.h>
#include <mach/at91_st.h>
#include "generic.h"
#include "clock.h"

8
arch/arm/mach-at91/at91rm9200_devices.c
View File

@ -17,10 +17,10 @@
#include <linux/platform_device.h>
#include <linux/i2c-gpio.h>
#include <asm/arch/board.h>
#include <asm/arch/gpio.h>
#include <asm/arch/at91rm9200.h>
#include <asm/arch/at91rm9200_mc.h>
#include <mach/board.h>
#include <mach/gpio.h>
#include <mach/at91rm9200.h>
#include <mach/at91rm9200_mc.h>
#include "generic.h"

2
arch/arm/mach-at91/at91rm9200_time.c
View File

@ -26,7 +26,7 @@
#include <asm/mach/time.h>
#include <asm/arch/at91_st.h>
#include <mach/at91_st.h>
static unsigned long last_crtr;
static u32 irqmask;

10
arch/arm/mach-at91/at91sam9260.c
View File

@ -15,11 +15,11 @@
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
#include <asm/arch/cpu.h>
#include <asm/arch/at91sam9260.h>
#include <asm/arch/at91_pmc.h>
#include <asm/arch/at91_rstc.h>
#include <asm/arch/at91_shdwc.h>
#include <mach/cpu.h>
#include <mach/at91sam9260.h>
#include <mach/at91_pmc.h>
#include <mach/at91_rstc.h>
#include <mach/at91_shdwc.h>
#include "generic.h"
#include "clock.h"

12
arch/arm/mach-at91/at91sam9260_devices.c
View File

@ -16,12 +16,12 @@
#include <linux/platform_device.h>
#include <linux/i2c-gpio.h>
#include <asm/arch/board.h>
#include <asm/arch/gpio.h>
#include <asm/arch/cpu.h>
#include <asm/arch/at91sam9260.h>
#include <asm/arch/at91sam9260_matrix.h>
#include <asm/arch/at91sam9_smc.h>
#include <mach/board.h>
#include <mach/gpio.h>
#include <mach/cpu.h>
#include <mach/at91sam9260.h>
#include <mach/at91sam9260_matrix.h>
#include <mach/at91sam9_smc.h>
#include "generic.h"

8
arch/arm/mach-at91/at91sam9261.c
View File

@ -15,10 +15,10 @@
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
#include <asm/arch/at91sam9261.h>
#include <asm/arch/at91_pmc.h>
#include <asm/arch/at91_rstc.h>
#include <asm/arch/at91_shdwc.h>
#include <mach/at91sam9261.h>
#include <mach/at91_pmc.h>
#include <mach/at91_rstc.h>
#include <mach/at91_shdwc.h>
#include "generic.h"
#include "clock.h"

10
arch/arm/mach-at91/at91sam9261_devices.c
View File

@ -20,11 +20,11 @@
#include <linux/fb.h>
#include <video/atmel_lcdc.h>
#include <asm/arch/board.h>
#include <asm/arch/gpio.h>
#include <asm/arch/at91sam9261.h>
#include <asm/arch/at91sam9261_matrix.h>
#include <asm/arch/at91sam9_smc.h>
#include <mach/board.h>
#include <mach/gpio.h>
#include <mach/at91sam9261.h>
#include <mach/at91sam9261_matrix.h>
#include <mach/at91sam9_smc.h>
#include "generic.h"

8
arch/arm/mach-at91/at91sam9263.c
View File

@ -15,10 +15,10 @@
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
#include <asm/arch/at91sam9263.h>
#include <asm/arch/at91_pmc.h>
#include <asm/arch/at91_rstc.h>
#include <asm/arch/at91_shdwc.h>
#include <mach/at91sam9263.h>
#include <mach/at91_pmc.h>
#include <mach/at91_rstc.h>
#include <mach/at91_shdwc.h>
#include "generic.h"
#include "clock.h"

10
arch/arm/mach-at91/at91sam9263_devices.c
View File

@ -19,11 +19,11 @@
#include <linux/fb.h>
#include <video/atmel_lcdc.h>
#include <asm/arch/board.h>
#include <asm/arch/gpio.h>
#include <asm/arch/at91sam9263.h>
#include <asm/arch/at91sam9263_matrix.h>
#include <asm/arch/at91sam9_smc.h>
#include <mach/board.h>
#include <mach/gpio.h>
#include <mach/at91sam9263.h>
#include <mach/at91sam9263_matrix.h>
#include <mach/at91sam9_smc.h>
#include "generic.h"

2
arch/arm/mach-at91/at91sam926x_time.c
View File

@ -17,7 +17,7 @@
#include <asm/mach/time.h>
#include <asm/arch/at91_pit.h>
#include <mach/at91_pit.h>
#define PIT_CPIV(x) ((x) & AT91_PIT_CPIV)

10
arch/arm/mach-at91/at91sam9rl.c
View File

@ -14,11 +14,11 @@
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
#include <asm/arch/cpu.h>
#include <asm/arch/at91sam9rl.h>
#include <asm/arch/at91_pmc.h>
#include <asm/arch/at91_rstc.h>
#include <asm/arch/at91_shdwc.h>
#include <mach/cpu.h>
#include <mach/at91sam9rl.h>
#include <mach/at91_pmc.h>
#include <mach/at91_rstc.h>
#include <mach/at91_shdwc.h>
#include "generic.h"
#include "clock.h"

10
arch/arm/mach-at91/at91sam9rl_devices.c
View File

@ -16,11 +16,11 @@
#include <linux/fb.h>
#include <video/atmel_lcdc.h>
#include <asm/arch/board.h>
#include <asm/arch/gpio.h>
#include <asm/arch/at91sam9rl.h>
#include <asm/arch/at91sam9rl_matrix.h>
#include <asm/arch/at91sam9_smc.h>
#include <mach/board.h>
#include <mach/gpio.h>
#include <mach/at91sam9rl.h>
#include <mach/at91sam9rl_matrix.h>
#include <mach/at91sam9_smc.h>
#include "generic.h"

6
arch/arm/mach-at91/at91x40.c
View File

@ -14,9 +14,9 @@
#include <linux/init.h>
#include <linux/irq.h>
#include <asm/mach/arch.h>
#include <asm/arch/at91x40.h>
#include <asm/arch/at91_st.h>
#include <asm/arch/timex.h>
#include <mach/at91x40.h>
#include <mach/at91_st.h>
#include <mach/timex.h>
#include "generic.h"
/*

4
arch/arm/mach-at91/at91x40_time.c
View File

@ -23,10 +23,10 @@
#include <linux/interrupt.h>
#include <linux/irq.h>
#include <linux/time.h>
#include <asm/hardware.h>
#include <mach/hardware.h>
#include <asm/io.h>
#include <asm/mach/time.h>
#include <asm/arch/at91_tc.h>
#include <mach/at91_tc.h>
/*
* 3 counter/timer units present.

6
arch/arm/mach-at91/board-1arm.c
View File

@ -24,7 +24,7 @@
#include <linux/module.h>
#include <linux/platform_device.h>
#include <asm/hardware.h>
#include <mach/hardware.h>
#include <asm/setup.h>
#include <asm/mach-types.h>
#include <asm/irq.h>
@ -33,8 +33,8 @@
#include <asm/mach/map.h>
#include <asm/mach/irq.h>
#include <asm/arch/board.h>
#include <asm/arch/gpio.h>
#include <mach/board.h>
#include <mach/gpio.h>
#include "generic.h"

6
arch/arm/mach-at91/board-cam60.c
View File

@ -28,7 +28,7 @@
#include <linux/spi/spi.h>
#include <linux/spi/flash.h>
#include <asm/hardware.h>
#include <mach/hardware.h>
#include <asm/setup.h>
#include <asm/mach-types.h>
#include <asm/irq.h>
@ -37,8 +37,8 @@
#include <asm/mach/map.h>
#include <asm/mach/irq.h>
#include <asm/arch/board.h>
#include <asm/arch/gpio.h>
#include <mach/board.h>
#include <mach/gpio.h>
#include "generic.h"

10
arch/arm/mach-at91/board-cap9adk.c
View File

@ -33,7 +33,7 @@
#include <video/atmel_lcdc.h>
#include <asm/hardware.h>
#include <mach/hardware.h>
#include <asm/setup.h>
#include <asm/mach-types.h>
#include <asm/irq.h>
@ -42,10 +42,10 @@
#include <asm/mach/map.h>
#include <asm/mach/irq.h>
#include <asm/arch/board.h>
#include <asm/arch/gpio.h>
#include <asm/arch/at91cap9_matrix.h>
#include <asm/arch/at91sam9_smc.h>
#include <mach/board.h>
#include <mach/gpio.h>
#include <mach/at91cap9_matrix.h>
#include <mach/at91sam9_smc.h>
#include "generic.h"

6
arch/arm/mach-at91/board-carmeva.c
View File

@ -25,7 +25,7 @@
#include <linux/module.h>
#include <linux/platform_device.h>
#include <asm/hardware.h>
#include <mach/hardware.h>
#include <asm/setup.h>
#include <asm/mach-types.h>
#include <asm/irq.h>
@ -34,8 +34,8 @@
#include <asm/mach/map.h>
#include <asm/mach/irq.h>
#include <asm/arch/board.h>
#include <asm/arch/gpio.h>
#include <mach/board.h>
#include <mach/gpio.h>
#include "generic.h"

6
arch/arm/mach-at91/board-csb337.c
View File

@ -28,7 +28,7 @@
#include <linux/input.h>
#include <linux/gpio_keys.h>
#include <asm/hardware.h>
#include <mach/hardware.h>
#include <asm/setup.h>
#include <asm/mach-types.h>
#include <asm/irq.h>
@ -37,8 +37,8 @@
#include <asm/mach/map.h>
#include <asm/mach/irq.h>
#include <asm/arch/board.h>
#include <asm/arch/gpio.h>
#include <mach/board.h>
#include <mach/gpio.h>
#include "generic.h"

6
arch/arm/mach-at91/board-csb637.c
View File

@ -25,7 +25,7 @@
#include <linux/platform_device.h>
#include <linux/mtd/physmap.h>
#include <asm/hardware.h>
#include <mach/hardware.h>
#include <asm/setup.h>
#include <asm/mach-types.h>
#include <asm/irq.h>
@ -34,8 +34,8 @@
#include <asm/mach/map.h>
#include <asm/mach/irq.h>
#include <asm/arch/board.h>
#include <asm/arch/gpio.h>
#include <mach/board.h>
#include <mach/gpio.h>
#include "generic.h"

8
arch/arm/mach-at91/board-dk.c
View File

@ -29,7 +29,7 @@
#include <linux/spi/spi.h>
#include <linux/mtd/physmap.h>
#include <asm/hardware.h>
#include <mach/hardware.h>
#include <asm/setup.h>
#include <asm/mach-types.h>
#include <asm/irq.h>
@ -38,9 +38,9 @@
#include <asm/mach/map.h>
#include <asm/mach/irq.h>
#include <asm/arch/board.h>
#include <asm/arch/gpio.h>
#include <asm/arch/at91rm9200_mc.h>
#include <mach/board.h>
#include <mach/gpio.h>
#include <mach/at91rm9200_mc.h>
#include "generic.h"

4
arch/arm/mach-at91/board-eb01.c
View File

@ -24,10 +24,10 @@
#include <linux/platform_device.h>
#include <linux/irq.h>
#include <asm/mach-types.h>
#include <asm/hardware.h>
#include <mach/hardware.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
#include <asm/arch/board.h>
#include <mach/board.h>
#include "generic.h"
static void __init at91eb01_map_io(void)

6
arch/arm/mach-at91/board-eb9200.c
View File

@ -25,7 +25,7 @@
#include <linux/module.h>
#include <linux/device.h>
#include <asm/hardware.h>
#include <mach/hardware.h>
#include <asm/setup.h>
#include <asm/mach-types.h>
#include <asm/irq.h>
@ -34,8 +34,8 @@
#include <asm/mach/map.h>
#include <asm/mach/irq.h>
#include <asm/arch/board.h>
#include <asm/arch/gpio.h>
#include <mach/board.h>
#include <mach/gpio.h>
#include "generic.h"

6
arch/arm/mach-at91/board-ecbat91.c
View File

@ -27,7 +27,7 @@
#include <linux/spi/spi.h>
#include <linux/spi/flash.h>
#include <asm/hardware.h>
#include <mach/hardware.h>
#include <asm/setup.h>
#include <asm/mach-types.h>
#include <asm/irq.h>
@ -36,8 +36,8 @@
#include <asm/mach/map.h>
#include <asm/mach/irq.h>
#include <asm/arch/board.h>
#include <asm/arch/gpio.h>
#include <mach/board.h>
#include <mach/gpio.h>
#include "generic.h"

8
arch/arm/mach-at91/board-ek.c
View File

@ -29,7 +29,7 @@
#include <linux/spi/spi.h>
#include <linux/mtd/physmap.h>
#include <asm/hardware.h>
#include <mach/hardware.h>
#include <asm/setup.h>
#include <asm/mach-types.h>
#include <asm/irq.h>
@ -38,9 +38,9 @@
#include <asm/mach/map.h>
#include <asm/mach/irq.h>
#include <asm/arch/board.h>
#include <asm/arch/gpio.h>
#include <asm/arch/at91rm9200_mc.h>
#include <mach/board.h>
#include <mach/gpio.h>
#include <mach/at91rm9200_mc.h>
#include "generic.h"

6
arch/arm/mach-at91/board-kafa.c
View File

@ -24,7 +24,7 @@
#include <linux/module.h>
#include <linux/platform_device.h>
#include <asm/hardware.h>
#include <mach/hardware.h>
#include <asm/setup.h>
#include <asm/mach-types.h>
#include <asm/irq.h>
@ -33,8 +33,8 @@
#include <asm/mach/map.h>
#include <asm/mach/irq.h>
#include <asm/arch/board.h>
#include <asm/arch/gpio.h>
#include <mach/board.h>
#include <mach/gpio.h>
#include "generic.h"

8
arch/arm/mach-at91/board-kb9202.c
View File

@ -25,7 +25,7 @@
#include <linux/module.h>
#include <linux/platform_device.h>
#include <asm/hardware.h>
#include <mach/hardware.h>
#include <asm/setup.h>
#include <asm/mach-types.h>
#include <asm/irq.h>
@ -34,10 +34,10 @@
#include <asm/mach/map.h>
#include <asm/mach/irq.h>
#include <asm/arch/board.h>
#include <asm/arch/gpio.h>
#include <mach/board.h>
#include <mach/gpio.h>
#include <asm/arch/at91rm9200_mc.h>
#include <mach/at91rm9200_mc.h>
#include "generic.h"

8
arch/arm/mach-at91/board-picotux200.c
View File

@ -27,7 +27,7 @@
#include <linux/spi/spi.h>
#include <linux/mtd/physmap.h>
#include <asm/hardware.h>
#include <mach/hardware.h>
#include <asm/setup.h>
#include <asm/mach-types.h>
#include <asm/irq.h>
@ -36,9 +36,9 @@
#include <asm/mach/map.h>
#include <asm/mach/irq.h>
#include <asm/arch/board.h>
#include <asm/arch/gpio.h>
#include <asm/arch/at91rm9200_mc.h>
#include <mach/board.h>
#include <mach/gpio.h>
#include <mach/at91rm9200_mc.h>
#include "generic.h"

8
arch/arm/mach-at91/board-qil-a9260.c
View File

@ -30,7 +30,7 @@
#include <linux/input.h>
#include <linux/clk.h>
#include <asm/hardware.h>
#include <mach/hardware.h>
#include <asm/setup.h>
#include <asm/mach-types.h>
#include <asm/irq.h>
@ -39,9 +39,9 @@
#include <asm/mach/map.h>
#include <asm/mach/irq.h>
#include <asm/arch/board.h>
#include <asm/arch/gpio.h>
#include <asm/arch/at91_shdwc.h>
#include <mach/board.h>
#include <mach/gpio.h>
#include <mach/at91_shdwc.h>
#include "generic.h"

6
arch/arm/mach-at91/board-sam9-l9260.c
View File

@ -27,7 +27,7 @@
#include <linux/platform_device.h>
#include <linux/spi/spi.h>
#include <asm/hardware.h>
#include <mach/hardware.h>
#include <asm/setup.h>
#include <asm/mach-types.h>
#include <asm/irq.h>
@ -36,8 +36,8 @@
#include <asm/mach/map.h>
#include <asm/mach/irq.h>
#include <asm/arch/board.h>
#include <asm/arch/gpio.h>
#include <mach/board.h>
#include <mach/gpio.h>
#include "generic.h"

6
arch/arm/mach-at91/board-sam9260ek.c
View File

@ -28,7 +28,7 @@
#include <linux/spi/at73c213.h>
#include <linux/clk.h>
#include <asm/hardware.h>
#include <mach/hardware.h>
#include <asm/setup.h>
#include <asm/mach-types.h>
#include <asm/irq.h>
@ -37,8 +37,8 @@
#include <asm/mach/map.h>
#include <asm/mach/irq.h>
#include <asm/arch/board.h>
#include <asm/arch/gpio.h>
#include <mach/board.h>
#include <mach/gpio.h>
#include "generic.h"

Some files were not shown because too many files have changed in this diff Show More