summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-at91/board-sam9263ek.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-11-15 17:41:21 +0100
committerArnd Bergmann <arnd@arndb.de>2012-11-15 17:41:21 +0100
commit8dbd2879e33be37adf40f747a5fb80ef1a6cd150 (patch)
treec688d7980be8c1c0dbf5e411caaf2c102120102e /arch/arm/mach-at91/board-sam9263ek.c
parentMerge tag 'omap-for-v3.8/gpmc-signed' of git://git.kernel.org/pub/scm/linux/k... (diff)
parentMerge branch 'omap-for-v3.8/cleanup-headers-prepare-multiplatform-v3' into om... (diff)
downloadlinux-8dbd2879e33be37adf40f747a5fb80ef1a6cd150.tar.xz
linux-8dbd2879e33be37adf40f747a5fb80ef1a6cd150.zip
Merge branch 'omap/dt' into next/drivers
Needed for the omap timer changes. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-at91/board-sam9263ek.c')
-rw-r--r--arch/arm/mach-at91/board-sam9263ek.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/board-sam9263ek.c b/arch/arm/mach-at91/board-sam9263ek.c
index 073e17403d98..b87dbe2be0d6 100644
--- a/arch/arm/mach-at91/board-sam9263ek.c
+++ b/arch/arm/mach-at91/board-sam9263ek.c
@@ -132,7 +132,7 @@ static struct spi_board_info ek_spi_devices[] = {
.max_speed_hz = 125000 * 26, /* (max sample rate @ 3V) * (cmd + data + overhead) */
.bus_num = 0,
.platform_data = &ads_info,
- .irq = AT91SAM9263_ID_IRQ1,
+ .irq = NR_IRQS_LEGACY + AT91SAM9263_ID_IRQ1,
},
#endif
};