diff options
| author | Olof Johansson <olof@lixom.net> | 2016-11-19 03:41:41 +0300 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2016-11-19 03:41:41 +0300 |
| commit | 9aa29e9e5e34789be18189102d2da0befc18a0d0 (patch) | |
| tree | fc9a81283fa03bdb1be5f263091315a96e05532d /include/linux | |
| parent | 04c0d567d31784da57dc2d196e0f5024e21fa763 (diff) | |
| parent | 5c02b01d234f8410010c952069d3fb9ec5d9124a (diff) | |
| download | linux-9aa29e9e5e34789be18189102d2da0befc18a0d0.tar.xz | |
Merge tag 'omap-for-v4.10/fixes-not-urgent-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/fixes-non-critical
Non-urgent fixes for omaps for v4.10 merge window:
- Fix mismatched interrupt numbers for tps65217, these are not yet
used
- Remove unused omapdss_early_init_of()
- Use seq_putc() for pm-debug.c
* tag 'omap-for-v4.10/fixes-not-urgent-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP2+: pm-debug: Use seq_putc() in two functions
ARM: OMAP2+: Remove the omapdss_early_init_of() function
mfd: tps65217: Fix mismatched interrupt number
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/mfd/tps65217.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/include/linux/mfd/tps65217.h b/include/linux/mfd/tps65217.h index 4ccda8969639..3cbec4b2496a 100644 --- a/include/linux/mfd/tps65217.h +++ b/include/linux/mfd/tps65217.h @@ -234,12 +234,11 @@ struct tps65217_bl_pdata { int dft_brightness; }; -enum tps65217_irq_type { - TPS65217_IRQ_PB, - TPS65217_IRQ_AC, - TPS65217_IRQ_USB, - TPS65217_NUM_IRQ -}; +/* Interrupt numbers */ +#define TPS65217_IRQ_USB 0 +#define TPS65217_IRQ_AC 1 +#define TPS65217_IRQ_PB 2 +#define TPS65217_NUM_IRQ 3 /** * struct tps65217_board - packages regulator init data |