summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/of_device.c
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2005-10-31 13:57:01 +1100
committerPaul Mackerras <paulus@samba.org>2005-10-31 13:57:01 +1100
commit734d6524800b6a8362666e893a5f3f29b9ef0be9 (patch)
tree507fe9acc6fccce31369842d89d86d8dd432dc37 /arch/powerpc/kernel/of_device.c
parent23fd07750a789a66fe88cf173d52a18f1a387da4 (diff)
downloadop-kernel-dev-734d6524800b6a8362666e893a5f3f29b9ef0be9.zip
op-kernel-dev-734d6524800b6a8362666e893a5f3f29b9ef0be9.tar.gz
powerpc: apply recent changes to merged code
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel/of_device.c')
-rw-r--r--arch/powerpc/kernel/of_device.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/of_device.c b/arch/powerpc/kernel/of_device.c
index 7667188..7065e40 100644
--- a/arch/powerpc/kernel/of_device.c
+++ b/arch/powerpc/kernel/of_device.c
@@ -4,6 +4,8 @@
#include <linux/init.h>
#include <linux/module.h>
#include <linux/mod_devicetable.h>
+#include <linux/slab.h>
+
#include <asm/errno.h>
#include <asm/of_device.h>
OpenPOWER on IntegriCloud