diff --git a/Documentation/arm/IXP4xx b/Documentation/arm/IXP4xx index 43edb4ecf27dbdd7138ea3c969f4c45cbcd720c7..72fbcc4fcab095fd61a886d3d542692a6f94d21e 100644 --- a/Documentation/arm/IXP4xx +++ b/Documentation/arm/IXP4xx @@ -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 diff --git a/Documentation/arm/Interrupts b/Documentation/arm/Interrupts index c202ed35d7d610dd3c399b50fdb65796917f1544..f09ab1b90ef1b486bb55273a53590b22fb8193fa 100644 --- a/Documentation/arm/Interrupts +++ b/Documentation/arm/Interrupts @@ -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 diff --git a/Documentation/arm/README b/Documentation/arm/README index 9b9c8226fdc428665fb2e792ce142b77abf2d80d..d98783fbe0c7c8b6ff95a6e61931fc56d4ef7a3b 100644 --- a/Documentation/arm/README +++ b/Documentation/arm/README @@ -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- and - include/asm-arm/arch- - which contain the source files to + arch/arm/mach- - which contain the source files to/include/mach support the machine class. This directories also contain any machine specific supporting code. diff --git a/Documentation/arm/Samsung-S3C24XX/GPIO.txt b/Documentation/arm/Samsung-S3C24XX/GPIO.txt index 8caea8c237eec0b9a033414c53ab2ea30b313800..b5d20c0b2ab46d60472797dad8dcf197971d9199 100644 --- a/Documentation/arm/Samsung-S3C24XX/GPIO.txt +++ b/Documentation/arm/Samsung-S3C24XX/GPIO.txt @@ -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 + is included by using #include The GPIO management functions are defined in the hardware - header include/asm-arm/arch-s3c2410/hardware.h which can be - included by #include + header arch/arm/mach-s3c2410/include/mach/hardware.h which can be + included by #include A useful amount of documentation can be found in the hardware header on how the GPIO functions (and others) work. diff --git a/Documentation/arm/Samsung-S3C24XX/Overview.txt b/Documentation/arm/Samsung-S3C24XX/Overview.txt index d04e1e30c47f8ff1a8613a369506e58cf5a41a21..014a8ec4877d296be7864abd82e663fb93e8c8f0 100644 --- a/Documentation/arm/Samsung-S3C24XX/Overview.txt +++ b/Documentation/arm/Samsung-S3C24XX/Overview.txt @@ -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 diff --git a/Documentation/arm/Samsung-S3C24XX/USB-Host.txt b/Documentation/arm/Samsung-S3C24XX/USB-Host.txt index b93b68e2b143ec72bed475f6a4203dc3fc485c70..67671eba423125179a6ab7f0e831225dab43bbbb 100644 --- a/Documentation/arm/Samsung-S3C24XX/USB-Host.txt +++ b/Documentation/arm/Samsung-S3C24XX/USB-Host.txt @@ -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 . diff --git a/Documentation/spi/pxa2xx b/Documentation/spi/pxa2xx index f3853cc37bde387e4608c27833e4653aa3811d3b..bbe8dee681a5d2b9a503d7f59b22e79d7a3e9014 100644 --- a/Documentation/spi/pxa2xx +++ b/Documentation/spi/pxa2xx @@ -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. diff --git a/Documentation/spi/spi-summary b/Documentation/spi/spi-summary index 6d5f18143c5038b30a8e522f078fd74362855b02..8bae2f018d342cf6f027ec5a2dc3ace9ad709bb8 100644 --- a/Documentation/spi/spi-summary +++ b/Documentation/spi/spi-summary @@ -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 /* for mysoc_spi_data */ + #include /* 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 + #include static struct platform_device spi2 = { ... }; diff --git a/MAINTAINERS b/MAINTAINERS index c67a402a6857d1ce1a39478a9450d8a79d119dda..5084539347f13ece508940fdfe06781d2752fb6f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -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 diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 2f07477442369ee44b88cbd7fe3a57bcea8ec774..703a44fa0f9b7c70814c17ab21e613eafcf4655a 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -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 diff --git a/arch/arm/boot/compressed/head-xscale.S b/arch/arm/boot/compressed/head-xscale.S index dd3fbd6766e14a6168aa8515c6c4a6e123d47166..aa5ee49c5c5ae7c1e37b6ab281a2f09388902f57 100644 --- a/arch/arm/boot/compressed/head-xscale.S +++ b/arch/arm/boot/compressed/head-xscale.S @@ -6,7 +6,6 @@ */ #include -#include .section ".start", "ax" diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S index de41daeab5e9832416218a0ca3e07b9a15cb219f..d42f89b7760bf2c537d3f4769bbc53715af7b6b5 100644 --- a/arch/arm/boot/compressed/head.S +++ b/arch/arm/boot/compressed/head.S @@ -37,7 +37,7 @@ #else -#include +#include .macro writeb, ch, rb senduart \ch, \rb diff --git a/arch/arm/boot/compressed/misc.c b/arch/arm/boot/compressed/misc.c index 7145cc7c04f0b8e36fb4b86205602fa7e0618bac..65ce8fff29db1583890fe54f438f6f03385e11a9 100644 --- a/arch/arm/boot/compressed/misc.c +++ b/arch/arm/boot/compressed/misc.c @@ -27,7 +27,7 @@ unsigned int __machine_arch_type; static void putstr(const char *ptr); #include -#include +#include #ifdef CONFIG_DEBUG_ICEDCC diff --git a/arch/arm/common/locomo.c b/arch/arm/common/locomo.c index 85579654d3b778761e912ae22b7eaea14f8b4ca9..283051eaf931c7b1f02b58690ec7239d25eed9d7 100644 --- a/arch/arm/common/locomo.c +++ b/arch/arm/common/locomo.c @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include #include diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c index f6d3fdda7067caafff09011a6b587b1e982f6d4a..ec8a5471bf06df84b2c54441619724631fc54b4c 100644 --- a/arch/arm/common/sa1111.c +++ b/arch/arm/common/sa1111.c @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include #include diff --git a/arch/arm/common/sharpsl_pm.c b/arch/arm/common/sharpsl_pm.c index 8822b684d474ad322b71bbcf3fe457316fdba775..db83091614082efb5aac4a6dc6630d5d2e99353f 100644 --- a/arch/arm/common/sharpsl_pm.c +++ b/arch/arm/common/sharpsl_pm.c @@ -26,13 +26,12 @@ #include #include -#include -#include +#include #include -#include -#include -#include -#include +#include +#include +#include +#include #include /* diff --git a/arch/arm/common/time-acorn.c b/arch/arm/common/time-acorn.c index d544da4147310954c6013e37863e786ece6ff312..df0983aafe694b6e58cab75da60e2eeff5ddb673 100644 --- a/arch/arm/common/time-acorn.c +++ b/arch/arm/common/time-acorn.c @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include diff --git a/arch/arm/common/uengine.c b/arch/arm/common/uengine.c index 117cab30bd36ca4e232fab5243b43ee81bc4b22c..7ecd3c0ab011a2c1196c9c61bdd0c34296c4b659 100644 --- a/arch/arm/common/uengine.c +++ b/arch/arm/common/uengine.c @@ -16,8 +16,7 @@ #include #include #include -#include -#include +#include #include #include diff --git a/arch/arm/include/asm/dma.h b/arch/arm/include/asm/dma.h index 9f2c5305c26014a9aea95faaf73a9c82c1260201..75154b1931173adc897597c228e21972594583d8 100644 --- a/arch/arm/include/asm/dma.h +++ b/arch/arm/include/asm/dma.h @@ -6,7 +6,7 @@ typedef unsigned int dmach_t; #include #include #include -#include +#include /* * This is the maximum virtual address which can be DMA'd from. diff --git a/arch/arm/include/asm/floppy.h b/arch/arm/include/asm/floppy.h index dce20c25ab10f87eb1c01426a79e4d08d078acb9..c9f03eccc9d86ce76c022d519b4ba66623aa3935 100644 --- a/arch/arm/include/asm/floppy.h +++ b/arch/arm/include/asm/floppy.h @@ -12,7 +12,7 @@ #ifndef __ASM_ARM_FLOPPY_H #define __ASM_ARM_FLOPPY_H #if 0 -#include +#include #endif #define fd_outb(val,port) \ diff --git a/arch/arm/include/asm/gpio.h b/arch/arm/include/asm/gpio.h index fff4f800ee421d797f7fa9240e8a485a8bdb7a51..166a7a3e28400db64062715a53bdb2f31d4e9df4 100644 --- a/arch/arm/include/asm/gpio.h +++ b/arch/arm/include/asm/gpio.h @@ -2,6 +2,6 @@ #define _ARCH_ARM_GPIO_H /* not all ARM platforms necessarily support this API ... */ -#include +#include #endif /* _ARCH_ARM_GPIO_H */ diff --git a/arch/arm/include/asm/hardware.h b/arch/arm/include/asm/hardware.h deleted file mode 100644 index eb3b3abb7db7a0b649a915f049e753aca6f15ee0..0000000000000000000000000000000000000000 --- a/arch/arm/include/asm/hardware.h +++ /dev/null @@ -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 - -#endif diff --git a/arch/arm/include/asm/hardware/dec21285.h b/arch/arm/include/asm/hardware/dec21285.h index 7068a1c1e4e4d3a6d8dd776ecc12cdc301617332..0d7552751aafc7d7abfdf1798ace6cc53db9131e 100644 --- a/arch/arm/include/asm/hardware/dec21285.h +++ b/arch/arm/include/asm/hardware/dec21285.h @@ -19,7 +19,7 @@ #define DC21285_PCI_MEM 0x80000000 #ifndef __ASSEMBLY__ -#include +#include #define DC21285_IO(x) ((volatile unsigned long *)(ARMCSR_BASE+(x))) #else #define DC21285_IO(x) (x) diff --git a/arch/arm/include/asm/hardware/iop3xx-adma.h b/arch/arm/include/asm/hardware/iop3xx-adma.h index af64676650a22b7f6817d0d809d4fc6d82d8966d..87bff09633aac50bdcffcdc0aae2891000cda161 100644 --- a/arch/arm/include/asm/hardware/iop3xx-adma.h +++ b/arch/arm/include/asm/hardware/iop3xx-adma.h @@ -19,7 +19,7 @@ #define _ADMA_H #include #include -#include +#include #include /* Memory copy units */ diff --git a/arch/arm/include/asm/hardware/iop3xx-gpio.h b/arch/arm/include/asm/hardware/iop3xx-gpio.h index 222e74b7c4639f10a0dfaefe9be199e7b02ab0f3..b69d972b1f7d21987c2ca86c7119cb101767f75d 100644 --- a/arch/arm/include/asm/hardware/iop3xx-gpio.h +++ b/arch/arm/include/asm/hardware/iop3xx-gpio.h @@ -25,7 +25,7 @@ #ifndef __ASM_ARM_HARDWARE_IOP3XX_GPIO_H #define __ASM_ARM_HARDWARE_IOP3XX_GPIO_H -#include +#include #include #define IOP3XX_N_GPIOS 8 diff --git a/arch/arm/include/asm/hardware/sa1111.h b/arch/arm/include/asm/hardware/sa1111.h index 6cf98d4f7dc3ee6bd913419c8f06f083891191b0..5da2595759e52c925873dbfe8fc2615f5a09e306 100644 --- a/arch/arm/include/asm/hardware/sa1111.h +++ b/arch/arm/include/asm/hardware/sa1111.h @@ -12,7 +12,7 @@ #ifndef _ASM_ARCH_SA1111 #define _ASM_ARCH_SA1111 -#include +#include /* * The SA1111 is always located at virtual 0xf4000000, and is always diff --git a/arch/arm/include/asm/hw_irq.h b/arch/arm/include/asm/hw_irq.h index f1a08a5006049eafa5d70b7f2ffc51eb989f8650..90831f6f5f5cb9b033097f895cfb5edc5dc8b7b6 100644 --- a/arch/arm/include/asm/hw_irq.h +++ b/arch/arm/include/asm/hw_irq.h @@ -4,6 +4,24 @@ #ifndef _ARCH_ARM_HW_IRQ_H #define _ARCH_ARM_HW_IRQ_H -#include +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 diff --git a/arch/arm/include/asm/io.h b/arch/arm/include/asm/io.h index ffe07c0f46d8d4019d5f48054d99e94827a7fdee..94a95d7fafd6cdaf887e26dcfad35dbe6590c39a 100644 --- a/arch/arm/include/asm/io.h +++ b/arch/arm/include/asm/io.h @@ -82,7 +82,7 @@ extern void __readwrite_bug(const char *fn); /* * Now, pick up the machine-defined IO definitions */ -#include +#include /* * IO port access primitives diff --git a/arch/arm/include/asm/irq.h b/arch/arm/include/asm/irq.h index 9cb01907e43bc1eb0ea2c4fce870f853ac221fd2..d6786090d02caf5e4d7f0ab8b2c59121d86d46b7 100644 --- a/arch/arm/include/asm/irq.h +++ b/arch/arm/include/asm/irq.h @@ -1,7 +1,7 @@ #ifndef __ASM_ARM_IRQ_H #define __ASM_ARM_IRQ_H -#include +#include #ifndef irq_canonicalize #define irq_canonicalize(i) (i) diff --git a/arch/arm/include/asm/mach/irq.h b/arch/arm/include/asm/mach/irq.h index c57b52ce574aadff6728eefebfcb5d2499dba3cc..acac5302e4eaf1860e2db8d77d2b47ee0f4cf399 100644 --- a/arch/arm/include/asm/mach/irq.h +++ b/arch/arm/include/asm/mach/irq.h @@ -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 diff --git a/arch/arm/include/asm/mc146818rtc.h b/arch/arm/include/asm/mc146818rtc.h index 7b81e0c4254398b123742fc380625d164da85053..e1ca48a9e973442aaeff9333990a457c155be394 100644 --- a/arch/arm/include/asm/mc146818rtc.h +++ b/arch/arm/include/asm/mc146818rtc.h @@ -4,7 +4,7 @@ #ifndef _ASM_MC146818RTC_H #define _ASM_MC146818RTC_H -#include +#include #include #ifndef RTC_PORT diff --git a/arch/arm/include/asm/memory.h b/arch/arm/include/asm/memory.h index 92069221dca9ba5f59b34b1ad2c06a72c77e6286..1e070a2b561aa3390a02abf4ce0263b06a9055f0 100644 --- a/arch/arm/include/asm/memory.h +++ b/arch/arm/include/asm/memory.h @@ -24,7 +24,7 @@ #endif #include -#include +#include #include #ifdef CONFIG_MMU diff --git a/arch/arm/include/asm/mmzone.h b/arch/arm/include/asm/mmzone.h index f2fbb508490160a212be0a1252e5deffeb64aceb..ae63a4fd28c83c8c7786b32550220cf6ad9f83f1 100644 --- a/arch/arm/include/asm/mmzone.h +++ b/arch/arm/include/asm/mmzone.h @@ -25,6 +25,6 @@ extern pg_data_t discontig_node_data[]; */ #define NODE_MEM_MAP(nid) (NODE_DATA(nid)->node_mem_map) -#include +#include #endif diff --git a/arch/arm/include/asm/mtd-xip.h b/arch/arm/include/asm/mtd-xip.h index 9eb127cc7db27347b26e73cdc7d34cd0f0f16d2b..4225372a26f30e594bebfb98c307a06f28ff83a4 100644 --- a/arch/arm/include/asm/mtd-xip.h +++ b/arch/arm/include/asm/mtd-xip.h @@ -17,8 +17,8 @@ #ifndef __ARM_MTD_XIP_H__ #define __ARM_MTD_XIP_H__ -#include -#include +#include +#include /* fill instruction prefetch */ #define xip_iprefetch() do { asm volatile (".rep 8; nop; .endr"); } while (0) diff --git a/arch/arm/include/asm/pci.h b/arch/arm/include/asm/pci.h index 2d84792f2e12d094095fd2b2b29f1a6cee2c2e3c..721c03d53f4b34ce07ae7e8c23f69942ac1e5c4f 100644 --- a/arch/arm/include/asm/pci.h +++ b/arch/arm/include/asm/pci.h @@ -4,7 +4,7 @@ #ifdef __KERNEL__ #include -#include /* for PCIBIOS_MIN_* */ +#include /* for PCIBIOS_MIN_* */ #define pcibios_scan_all_fns(a, b) 0 diff --git a/arch/arm/include/asm/pgtable.h b/arch/arm/include/asm/pgtable.h index 8ab060a53ab0a9cb4913de95048e4a1b6fd79028..8e21ef15bd743b9fb3b019bd7c9cc559c3c2ab61 100644 --- a/arch/arm/include/asm/pgtable.h +++ b/arch/arm/include/asm/pgtable.h @@ -20,7 +20,7 @@ #else #include -#include +#include #include /* diff --git a/arch/arm/include/asm/smp.h b/arch/arm/include/asm/smp.h index cc12a525a06a337e61d1448d23968111230e11d5..727b5c042e522c9053873501803946a95433838b 100644 --- a/arch/arm/include/asm/smp.h +++ b/arch/arm/include/asm/smp.h @@ -14,7 +14,7 @@ #include #include -#include +#include #ifndef CONFIG_SMP # error " included in non-SMP build" diff --git a/arch/arm/include/asm/timex.h b/arch/arm/include/asm/timex.h index e50e2926cd6ecce6ad0b038aa8ff2f56d25f937f..3be8de3adabae95908a9a6f640d3e9e42b0f7fb1 100644 --- a/arch/arm/include/asm/timex.h +++ b/arch/arm/include/asm/timex.h @@ -12,7 +12,7 @@ #ifndef _ASMARM_TIMEX_H #define _ASMARM_TIMEX_H -#include +#include typedef unsigned long cycles_t; diff --git a/arch/arm/include/asm/vga.h b/arch/arm/include/asm/vga.h index 1e0b913c3d71ce9be96847b128b3965da2672f21..6a3cd2a2f6700d386a5cc82921eb9e6b6f76258e 100644 --- a/arch/arm/include/asm/vga.h +++ b/arch/arm/include/asm/vga.h @@ -1,7 +1,7 @@ #ifndef ASMARM_VGA_H #define ASMARM_VGA_H -#include +#include #include #define VGA_MAP_MEM(x,s) (PCIMEM_BASE + (x)) diff --git a/arch/arm/kernel/crunch-bits.S b/arch/arm/kernel/crunch-bits.S index a26886758c6737590e674c22b61515e7df9814e0..0ec9bb48fab9cd9b4ea20ab32ac9694d8d0d9881 100644 --- a/arch/arm/kernel/crunch-bits.S +++ b/arch/arm/kernel/crunch-bits.S @@ -16,7 +16,7 @@ #include #include #include -#include +#include /* * We can't use hex constants here due to a bug in gas. diff --git a/arch/arm/kernel/crunch.c b/arch/arm/kernel/crunch.c index 627d79414c9d68212382eaefe64af6f896035509..3b6a1c293ee49cb03825a860a5edc0866133cf17 100644 --- a/arch/arm/kernel/crunch.c +++ b/arch/arm/kernel/crunch.c @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include diff --git a/arch/arm/kernel/debug.S b/arch/arm/kernel/debug.S index 5617566477b493d5cc6034a8518b8f6e696195f3..9550ff0ddde4f57393a3ccf1350c032e5115db2b 100644 --- a/arch/arm/kernel/debug.S +++ b/arch/arm/kernel/debug.S @@ -80,7 +80,7 @@ #endif /* CONFIG_CPU_V6 */ #else -#include +#include #endif /* CONFIG_DEBUG_ICEDCC */ /* diff --git a/arch/arm/kernel/ecard.c b/arch/arm/kernel/ecard.c index f5cfdabcb87dc8314d488dae8d864ecf4b4ca9e4..7a50575a8d4dbfe153c6d786ed5c3ba6138fa1f8 100644 --- a/arch/arm/kernel/ecard.c +++ b/arch/arm/kernel/ecard.c @@ -46,7 +46,7 @@ #include #include -#include +#include #include #include #include diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S index 7dca225752c1c49e1e77c9014bf831e3045b1ffa..617e509d60dfd1bdc148467d473e3c8596b2bb89 100644 --- a/arch/arm/kernel/entry-armv.S +++ b/arch/arm/kernel/entry-armv.S @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include "entry-header.S" diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S index 84694e88b4289d07d2b952f69a1ff644ca010fb2..060d7e2e9f6408c1aaf647af4eba7b5858a8aa31 100644 --- a/arch/arm/kernel/entry-common.S +++ b/arch/arm/kernel/entry-common.S @@ -10,7 +10,7 @@ #include #include -#include +#include #include "entry-header.S" diff --git a/arch/arm/kernel/head-nommu.S b/arch/arm/kernel/head-nommu.S index 5d78ffb8a9a7fe0e653f9356d5b873896492a53c..27329bd32037a714070535ae1677e30271881ee1 100644 --- a/arch/arm/kernel/head-nommu.S +++ b/arch/arm/kernel/head-nommu.S @@ -15,7 +15,6 @@ #include #include -#include #include #include #include diff --git a/arch/arm/kernel/irq.c b/arch/arm/kernel/irq.c index 11dcd52e51be35e7530638dc21f7ed3f91fe8a05..f88efb135b702b2e4e9610dd9df490331df71c5c 100644 --- a/arch/arm/kernel/irq.c +++ b/arch/arm/kernel/irq.c @@ -38,6 +38,7 @@ #include #include +#include #include /* diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c index 89bfded70a1f480ced698568a9d5fd685c48a17b..3fd88233706413d09198bb6a69780415a9b5eb5e 100644 --- a/arch/arm/kernel/process.c +++ b/arch/arm/kernel/process.c @@ -51,7 +51,7 @@ extern void setup_mm_for_reboot(char mode); static volatile int hlt_counter; -#include +#include void disable_hlt(void) { diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c index 5a7c09564d134cfdb8935f642e691de3f29b82c3..e9842f6767f959b3cfb134b7325f4076ca1dcf89 100644 --- a/arch/arm/kernel/smp.c +++ b/arch/arm/kernel/smp.c @@ -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) { diff --git a/arch/arm/lib/ecard.S b/arch/arm/lib/ecard.S index c55aaa2a2088bfea4cd28bcba11f6da6d6c1169c..8678eb2b7a60a21feaf0a74a919cf3a536dc3fd0 100644 --- a/arch/arm/lib/ecard.S +++ b/arch/arm/lib/ecard.S @@ -12,7 +12,7 @@ */ #include #include -#include +#include #define CPSR2SPSR(rt) \ mrs rt, cpsr; \ diff --git a/arch/arm/lib/io-readsw-armv3.S b/arch/arm/lib/io-readsw-armv3.S index 4ef9041851423fb7006cd6d8210a5bcec395ee72..9aaf7c72065d852a9fa049479d8f333430c0fe26 100644 --- a/arch/arm/lib/io-readsw-armv3.S +++ b/arch/arm/lib/io-readsw-armv3.S @@ -9,7 +9,7 @@ */ #include #include -#include +#include .Linsw_bad_alignment: adr r0, .Linsw_bad_align_msg diff --git a/arch/arm/lib/io-writesw-armv3.S b/arch/arm/lib/io-writesw-armv3.S index 1607a29f49b718c533c1372c1fae8df9ebd48121..cd34503e424d6ef41aa1664be9857619d7563bf8 100644 --- a/arch/arm/lib/io-writesw-armv3.S +++ b/arch/arm/lib/io-writesw-armv3.S @@ -9,7 +9,7 @@ */ #include #include -#include +#include .Loutsw_bad_alignment: adr r0, .Loutsw_bad_align_msg diff --git a/arch/arm/mach-aaec2000/aaed2000.c b/arch/arm/mach-aaec2000/aaed2000.c index 83f57da3184cceea1dd3ba64bd860b1fb9435993..81a3ecc0d104d0eddc0eb74a7609c42b082aff75 100644 --- a/arch/arm/mach-aaec2000/aaed2000.c +++ b/arch/arm/mach-aaec2000/aaed2000.c @@ -20,14 +20,14 @@ #include #include #include -#include +#include #include #include #include #include -#include +#include #include "core.h" diff --git a/arch/arm/mach-aaec2000/core.c b/arch/arm/mach-aaec2000/core.c index b016be2b0e35360ac135b6db8521e3b6d10cfb01..dfb26bc23d1a8838d8a8fd8a5a5bd37079f45051 100644 --- a/arch/arm/mach-aaec2000/core.c +++ b/arch/arm/mach-aaec2000/core.c @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include diff --git a/include/asm-arm/arch-aaec2000/aaec2000.h b/arch/arm/mach-aaec2000/include/mach/aaec2000.h similarity index 99% rename from include/asm-arm/arch-aaec2000/aaec2000.h rename to arch/arm/mach-aaec2000/include/mach/aaec2000.h index a6d1ee0980f21d3372a552952f79c4aaef96c0da..bc729c42f8437dfae4f1e9aac9db2eb1d336d414 100644 --- a/include/asm-arm/arch-aaec2000/aaec2000.h +++ b/arch/arm/mach-aaec2000/include/mach/aaec2000.h @@ -1,5 +1,5 @@ /* - * linux/include/asm-arm/arch-aaec2000/aaec2000.h + * arch/arm/mach-aaec2000/include/mach/aaec2000.h * * AAEC-2000 registers definition * diff --git a/include/asm-arm/arch-aaec2000/aaed2000.h b/arch/arm/mach-aaec2000/include/mach/aaed2000.h similarity index 96% rename from include/asm-arm/arch-aaec2000/aaed2000.h rename to arch/arm/mach-aaec2000/include/mach/aaed2000.h index bc76d2badb91f733301138f4006c7c3e56da1ee6..f821295ca71bb819a05e565598f10cb34229430b 100644 --- a/include/asm-arm/arch-aaec2000/aaed2000.h +++ b/arch/arm/mach-aaec2000/include/mach/aaed2000.h @@ -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 * diff --git a/include/asm-arm/arch-aaec2000/debug-macro.S b/arch/arm/mach-aaec2000/include/mach/debug-macro.S similarity index 93% rename from include/asm-arm/arch-aaec2000/debug-macro.S rename to arch/arm/mach-aaec2000/include/mach/debug-macro.S index 7b1fce021d8a6c497c1817cb21750cf563c8d6f7..0b6351d7c38973e7431c601e291afab173d54551 100644 --- a/include/asm-arm/arch-aaec2000/debug-macro.S +++ b/arch/arm/mach-aaec2000/include/mach/debug-macro.S @@ -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 * diff --git a/include/asm-arm/arch-aaec2000/dma.h b/arch/arm/mach-aaec2000/include/mach/dma.h similarity index 84% rename from include/asm-arm/arch-aaec2000/dma.h rename to arch/arm/mach-aaec2000/include/mach/dma.h index e100b1e526fe972e0a8fa9f9721bf2bc5d685d2a..2da846c72fe736b0550d815815380c13fb861661 100644 --- a/include/asm-arm/arch-aaec2000/dma.h +++ b/arch/arm/mach-aaec2000/include/mach/dma.h @@ -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 * diff --git a/include/asm-arm/arch-aaec2000/entry-macro.S b/arch/arm/mach-aaec2000/include/mach/entry-macro.S similarity index 91% rename from include/asm-arm/arch-aaec2000/entry-macro.S rename to arch/arm/mach-aaec2000/include/mach/entry-macro.S index 83fdf68f6b7c9c216a1d6bbfe6152089fa414785..c8fb34469007952ac377eb7a7c0114e38b8b90b9 100644 --- a/include/asm-arm/arch-aaec2000/entry-macro.S +++ b/arch/arm/mach-aaec2000/include/mach/entry-macro.S @@ -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 +#include .macro disable_fiq .endm diff --git a/include/asm-arm/arch-aaec2000/hardware.h b/arch/arm/mach-aaec2000/include/mach/hardware.h similarity index 93% rename from include/asm-arm/arch-aaec2000/hardware.h rename to arch/arm/mach-aaec2000/include/mach/hardware.h index 153506fd06ed0a78caa630383952f6817d54d153..965a6f6672d64c9f609be04a767d4fc8920ef718 100644 --- a/include/asm-arm/arch-aaec2000/hardware.h +++ b/arch/arm/mach-aaec2000/include/mach/hardware.h @@ -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 -#include +#include /* The kernel is loaded at physical address 0xf8000000. * We map the IO space a bit after diff --git a/include/asm-arm/arch-aaec2000/io.h b/arch/arm/mach-aaec2000/include/mach/io.h similarity index 83% rename from include/asm-arm/arch-aaec2000/io.h rename to arch/arm/mach-aaec2000/include/mach/io.h index d710204ac7479607c4899cf32722e7786b8c86ae..c87c24de1110b1f1d33bf46234699fcba23aa14b 100644 --- a/include/asm-arm/arch-aaec2000/io.h +++ b/arch/arm/mach-aaec2000/include/mach/io.h @@ -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 +#include #define IO_SPACE_LIMIT 0xffffffff diff --git a/include/asm-arm/arch-aaec2000/irqs.h b/arch/arm/mach-aaec2000/include/mach/irqs.h similarity index 97% rename from include/asm-arm/arch-aaec2000/irqs.h rename to arch/arm/mach-aaec2000/include/mach/irqs.h index de252220e806e8743688109929f707b1211a4473..bf45c6d2f294fa1436699aa2b246d426022b4746 100644 --- a/include/asm-arm/arch-aaec2000/irqs.h +++ b/arch/arm/mach-aaec2000/include/mach/irqs.h @@ -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 * diff --git a/include/asm-arm/arch-aaec2000/memory.h b/arch/arm/mach-aaec2000/include/mach/memory.h similarity index 93% rename from include/asm-arm/arch-aaec2000/memory.h rename to arch/arm/mach-aaec2000/include/mach/memory.h index 9eceb4148922e7e1a9bff39f1ca263ae73b2c134..56ae900a482e28d1bd697bd030f316fc809c2a0a 100644 --- a/include/asm-arm/arch-aaec2000/memory.h +++ b/arch/arm/mach-aaec2000/include/mach/memory.h @@ -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 * diff --git a/include/asm-arm/arch-aaec2000/system.h b/arch/arm/mach-aaec2000/include/mach/system.h similarity index 90% rename from include/asm-arm/arch-aaec2000/system.h rename to arch/arm/mach-aaec2000/include/mach/system.h index 08de97b407a8372c0eb9911f21d02d6b8bd065a9..8f4115d734ce18832d005a31086694d643def027 100644 --- a/include/asm-arm/arch-aaec2000/system.h +++ b/arch/arm/mach-aaec2000/include/mach/system.h @@ -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 * diff --git a/include/asm-arm/arch-aaec2000/timex.h b/arch/arm/mach-aaec2000/include/mach/timex.h similarity index 89% rename from include/asm-arm/arch-aaec2000/timex.h rename to arch/arm/mach-aaec2000/include/mach/timex.h index f5708b38fb7f2f768d3319582feca7f8c11bc654..6c8edf4a8828a35b3ed838fd44e3786a1511f918 100644 --- a/include/asm-arm/arch-aaec2000/timex.h +++ b/arch/arm/mach-aaec2000/include/mach/timex.h @@ -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 * diff --git a/include/asm-arm/arch-aaec2000/uncompress.h b/arch/arm/mach-aaec2000/include/mach/uncompress.h similarity index 94% rename from include/asm-arm/arch-aaec2000/uncompress.h rename to arch/arm/mach-aaec2000/include/mach/uncompress.h index 300f4bf3bc74c0d973e48125a92d3adadc7d9694..381ecad1a1bba78d424d375e831ed562b8c28907 100644 --- a/include/asm-arm/arch-aaec2000/uncompress.h +++ b/arch/arm/mach-aaec2000/include/mach/uncompress.h @@ -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 * diff --git a/include/asm-arm/arch-aaec2000/vmalloc.h b/arch/arm/mach-aaec2000/include/mach/vmalloc.h similarity index 88% rename from include/asm-arm/arch-aaec2000/vmalloc.h rename to arch/arm/mach-aaec2000/include/mach/vmalloc.h index ecb991e2e4fffe88694d6ff19fb7d8a8b97de01d..551f68f666bf0273bb465272887cedfbe7244b94 100644 --- a/include/asm-arm/arch-aaec2000/vmalloc.h +++ b/arch/arm/mach-aaec2000/include/mach/vmalloc.h @@ -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 * diff --git a/arch/arm/mach-at91/at91cap9.c b/arch/arm/mach-at91/at91cap9.c index 933fa8f55cbc76fa60c6b52d714245dff2503125..638948c16770e50ce21cba285f0b7d65d6ca2fcd 100644 --- a/arch/arm/mach-at91/at91cap9.c +++ b/arch/arm/mach-at91/at91cap9.c @@ -17,10 +17,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include "generic.h" #include "clock.h" diff --git a/arch/arm/mach-at91/at91cap9_devices.c b/arch/arm/mach-at91/at91cap9_devices.c index 25765f1afca9c443499b60a87e6546061f12f92e..abb4aac8fa983a6c90742d86cd12e460c36b8cf7 100644 --- a/arch/arm/mach-at91/at91cap9_devices.c +++ b/arch/arm/mach-at91/at91cap9_devices.c @@ -20,11 +20,11 @@ #include