diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-12 11:51:35 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-12 11:51:35 -0700 |
| commit | 4c7527821c125c76432c30c8781667f55bed600c (patch) | |
| tree | a4c4ffda304f6d871187b61fc0306cff3dbcf381 /arch/arm/mach-cns3xxx/include/mach/system.h | |
| parent | 14d01ff5341866773e24c5b54a94f7e2520ca271 (diff) | |
| parent | 15ce92861f7fe59de83667c0124a7ead3423c7a0 (diff) | |
Merge branch 'fixes' of git://git.linaro.org/people/arnd/arm-soc
* 'fixes' of git://git.linaro.org/people/arnd/arm-soc:
ARM: CSR: add missing sentinels to of_device_id tables
ARM: cns3xxx: Fix newly introduced warnings in the PCIe code
ARM: cns3xxx: Fix compile error caused by hardware.h removed
ARM: davinci: fix cache flush build error
ARM: davinci: correct MDSTAT_STATE_MASK
ARM: davinci: da850 EVM: read mac address from SPI flash
OMAP: omap_device: fix !CONFIG_SUSPEND case in _noirq handlers
OMAP2430: hwmod: musb: add missing terminator to omap2430_usbhsotg_addrs[]
OMAP3: clock: indicate that gpt12_fck and wdt1_fck are in the WKUP clockdomain
OMAP4: clock: fix compile warning
OMAP4: clock: re-enable previous clockdomain enable/disable sequence
OMAP: clockdomain: Wait for powerdomain to be ON when using clockdomain force wakeup
OMAP: powerdomains: Make all powerdomain target states as ON at init
Diffstat (limited to 'arch/arm/mach-cns3xxx/include/mach/system.h')
| -rw-r--r-- | arch/arm/mach-cns3xxx/include/mach/system.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-cns3xxx/include/mach/system.h b/arch/arm/mach-cns3xxx/include/mach/system.h index 58bb03ae3cf..4f16c9b79f7 100644 --- a/arch/arm/mach-cns3xxx/include/mach/system.h +++ b/arch/arm/mach-cns3xxx/include/mach/system.h @@ -13,7 +13,6 @@ #include <linux/io.h> #include <asm/proc-fns.h> -#include <mach/hardware.h> static inline void arch_idle(void) { |