diff options
| author | Paul Mackerras | 2005-10-31 03:57:01 +0100 |
|---|---|---|
| committer | Paul Mackerras | 2005-10-31 03:57:01 +0100 |
| commit | 734d6524800b6a8362666e893a5f3f29b9ef0be9 (patch) | |
| tree | 507fe9acc6fccce31369842d89d86d8dd432dc37 /arch/powerpc/kernel/of_device.c | |
| parent | Merge ../linux-2.6 by hand (diff) | |
| download | kernel-qcow2-linux-734d6524800b6a8362666e893a5f3f29b9ef0be9.tar.gz kernel-qcow2-linux-734d6524800b6a8362666e893a5f3f29b9ef0be9.tar.xz kernel-qcow2-linux-734d6524800b6a8362666e893a5f3f29b9ef0be9.zip | |
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.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/of_device.c b/arch/powerpc/kernel/of_device.c index 766718814515..7065e40e2f42 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> |