summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-08-02 18:07:36 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-08-02 18:07:36 -0700
commitd08c31812e5ce5867ff0fe1da68d6c375984a597 (patch)
tree9cbb8a993d6105909ff1d3009be879d0ebc914a3 /drivers
parent27667f4744fc5a0f3e50910e78740bac5670d18b (diff)
parentb8d65e9662b1ffb3b52a65fd11b0b968022dc6a1 (diff)
downloadlinux-d08c31812e5ce5867ff0fe1da68d6c375984a597.tar.bz2
Merge tag 'powerpc-4.2-3' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux
Pull powerpc fixes from Michael Ellerman: - TCE table memory calculation fix from Alexey - Build fix for ans-lcd from Luis - Unbalanced IRQ warning fix from Alistair * tag 'powerpc-4.2-3' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: powerpc/eeh-powernv: Fix unbalanced IRQ warning macintosh/ans-lcd: fix build failure after module_init/exit relocation powerpc/powernv/ioda2: Fix calculation for memory allocated for TCE table
Diffstat (limited to 'drivers')
-rw-r--r--drivers/macintosh/ans-lcd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/macintosh/ans-lcd.c b/drivers/macintosh/ans-lcd.c
index 1a57e88a38f7..cd35079c8c98 100644
--- a/drivers/macintosh/ans-lcd.c
+++ b/drivers/macintosh/ans-lcd.c
@@ -7,7 +7,7 @@
#include <linux/kernel.h>
#include <linux/miscdevice.h>
#include <linux/fcntl.h>
-#include <linux/init.h>
+#include <linux/module.h>
#include <linux/delay.h>
#include <linux/fs.h>