diff options
| author | Olof Johansson <olof@lixom.net> | 2015-10-31 01:41:45 +0000 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-10-31 01:42:13 +0000 |
| commit | 53dd186b3fb7254ae0cb4d6648abb5589aaa8c2d (patch) | |
| tree | 517f31b37c329e3e2f7558614ac5267f1f8641f8 /include | |
| parent | 4db7062c9a8bff92137bb2f381d81dd1bb5b7872 (diff) | |
| parent | 8f2279d5d908119a08e906be1c6b69c744d0c379 (diff) | |
Merge tag 'omap-for-v4.3/fixes-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
Two omap regression fixes:
- Fix omap3 MUSB with DMA caused by driver core changes
- Fix LCD DMA interrupt number for omap1 that did not
get changed for sparse IRQ changes
* tag 'omap-for-v4.3/fixes-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
usb: musb: omap2430: Fix regression caused by driver core change
ARM: OMAP1: fix incorrect INT_DMA_LCD
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/omap-dma.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/omap-dma.h b/include/linux/omap-dma.h index e5a70132a240..88fa8af2b937 100644 --- a/include/linux/omap-dma.h +++ b/include/linux/omap-dma.h @@ -17,7 +17,7 @@ #include <linux/platform_device.h> -#define INT_DMA_LCD 25 +#define INT_DMA_LCD (NR_IRQS_LEGACY + 25) #define OMAP1_DMA_TOUT_IRQ (1 << 0) #define OMAP_DMA_DROP_IRQ (1 << 1) |