commit | 734d6524800b6a8362666e893a5f3f29b9ef0be9 | [log] [tgz] |
---|---|---|
author | Paul Mackerras <paulus@samba.org> | Mon Oct 31 13:57:01 2005 +1100 |
committer | Paul Mackerras <paulus@samba.org> | Mon Oct 31 13:57:01 2005 +1100 |
tree | 507fe9acc6fccce31369842d89d86d8dd432dc37 | |
parent | 23fd07750a789a66fe88cf173d52a18f1a387da4 [diff] [blame] |
powerpc: apply recent changes to merged code Signed-off-by: Paul Mackerras <paulus@samba.org>
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>