diff options
author | Tony Lindgren | 2012-11-09 23:58:01 +0100 |
---|---|---|
committer | Tony Lindgren | 2012-11-09 23:58:01 +0100 |
commit | edf8dde393f879fc2d8c22d4bc01ff8d37b80e1a (patch) | |
tree | 61425adc8b2059a9c12a3ce66ba7361fea1b0bb3 /arch/arm/mach-at91/board-sam9263ek.c | |
parent | ARM: OMAP: Remove omap_init_consistent_dma_size() (diff) | |
parent | Linux 3.7-rc4 (diff) | |
download | kernel-qcow2-linux-edf8dde393f879fc2d8c22d4bc01ff8d37b80e1a.tar.gz kernel-qcow2-linux-edf8dde393f879fc2d8c22d4bc01ff8d37b80e1a.tar.xz kernel-qcow2-linux-edf8dde393f879fc2d8c22d4bc01ff8d37b80e1a.zip |
Merge branch 'linus' into omap-for-v3.8/cleanup-headers-prepare-multiplatform-v3
Diffstat (limited to 'arch/arm/mach-at91/board-sam9263ek.c')
-rw-r--r-- | arch/arm/mach-at91/board-sam9263ek.c | 2 |
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 }; |