diff options
author | Tony Lindgren <tony@atomide.com> | 2014-03-02 14:22:03 -0800 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2014-03-02 14:22:03 -0800 |
commit | f777ba1780584b100ab9664cc06d04f3bb273a84 (patch) | |
tree | 865813eb0078530ca3b036c0c3eee6ce33f9315f /arch/arm/mach-pxa/include/mach/pcm027.h | |
parent | f68e355c86cff91e5266cf937ea24fcba0641900 (diff) | |
parent | 1a5fe3ca5ea192d4309dd61f3626b79ff38693c2 (diff) | |
download | talos-op-linux-f777ba1780584b100ab9664cc06d04f3bb273a84.tar.gz talos-op-linux-f777ba1780584b100ab9664cc06d04f3bb273a84.zip |
Merge tag 'for_3.15/dts_signed' of git://git.kernel.org/pub/scm/linux/kernel/git/bcousson/linux-omap-dt into omap-for-v3.15/dt
Add craneboard devices
Add more N900 devices
Add am43x-epos-evm and am437x-gp-evm devices
Add OMAP4 DMM devices
Conflicts:
arch/arm/boot/dts/am43x-epos-evm.dts
arch/arm/boot/dts/dra7.dtsi
Diffstat (limited to 'arch/arm/mach-pxa/include/mach/pcm027.h')
-rw-r--r-- | arch/arm/mach-pxa/include/mach/pcm027.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/include/mach/pcm027.h b/arch/arm/mach-pxa/include/mach/pcm027.h index 6bf28de228bd..86ebd7b6c960 100644 --- a/arch/arm/mach-pxa/include/mach/pcm027.h +++ b/arch/arm/mach-pxa/include/mach/pcm027.h @@ -23,6 +23,8 @@ * Definitions of CPU card resources only */ +#include "irqs.h" /* PXA_GPIO_TO_IRQ */ + /* phyCORE-PXA270 (PCM027) Interrupts */ #define PCM027_IRQ(x) (IRQ_BOARD_START + (x)) #define PCM027_BTDET_IRQ PCM027_IRQ(0) |