diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-10-31 21:36:07 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-10-31 21:36:07 -0700 |
| commit | 56ef9db24633cf6528d2ce736de0985eb125a3c1 (patch) | |
| tree | 5651fa975dce33809537d34884e3d9d26b7f98d2 /include | |
| parent | 060b85b0d3064032b6810928973f8c7a15ab9c11 (diff) | |
| parent | 53dd186b3fb7254ae0cb4d6648abb5589aaa8c2d (diff) | |
Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC fixes from Olof Johansson:
"This should be our final batch of fixes for 4.3:
- A patch from Sudeep Holla that fixes annotation of wakeup sources
properly, old unused format seems to have spread through copying.
- Two patches from Tony for OMAP. One dealing with MUSB setup
problems due to runtime PM being enabled too early on the parent
device. The other fixes IRQ numbering for OMAP1"
* tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
usb: musb: omap2430: Fix regression caused by driver core change
ARM: OMAP1: fix incorrect INT_DMA_LCD
ARM: dts: fix gpio-keys wakeup-source property
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) |