diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2015-10-13 19:00:14 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2015-10-13 19:00:14 +0200 |
| commit | e50226b4b86755e65aef2129e94d952fee3df722 (patch) | |
| tree | d4dd925fc7f5c6fe46b647c8027911190595f014 /arch/mips/jz4740/board-qi_lb60.c | |
| parent | genirq: Add flag to force mask in disable_irq[_nosync]() (diff) | |
| parent | Linux 4.3-rc5 (diff) | |
| download | linux-e50226b4b86755e65aef2129e94d952fee3df722.tar.xz linux-e50226b4b86755e65aef2129e94d952fee3df722.zip | |
Merge branch 'linus' into irq/core
Bring in upstream updates for patches which depend on them
Diffstat (limited to 'arch/mips/jz4740/board-qi_lb60.c')
| -rw-r--r-- | arch/mips/jz4740/board-qi_lb60.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/jz4740/board-qi_lb60.c b/arch/mips/jz4740/board-qi_lb60.c index 4e62bf85d0b0..459cb017306c 100644 --- a/arch/mips/jz4740/board-qi_lb60.c +++ b/arch/mips/jz4740/board-qi_lb60.c @@ -26,6 +26,7 @@ #include <linux/power/jz4740-battery.h> #include <linux/power/gpio-charger.h> +#include <asm/mach-jz4740/gpio.h> #include <asm/mach-jz4740/jz4740_fb.h> #include <asm/mach-jz4740/jz4740_mmc.h> #include <asm/mach-jz4740/jz4740_nand.h> |