diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-10-30 21:57:01 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-30 21:57:01 -0500 |
| commit | 734d6524800b6a8362666e893a5f3f29b9ef0be9 (patch) | |
| tree | 507fe9acc6fccce31369842d89d86d8dd432dc37 /arch/powerpc/kernel/of_device.c | |
| parent | 23fd07750a789a66fe88cf173d52a18f1a387da4 (diff) | |
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 @@ | |||
| 4 | #include <linux/init.h> | 4 | #include <linux/init.h> |
| 5 | #include <linux/module.h> | 5 | #include <linux/module.h> |
| 6 | #include <linux/mod_devicetable.h> | 6 | #include <linux/mod_devicetable.h> |
| 7 | #include <linux/slab.h> | ||
| 8 | |||
| 7 | #include <asm/errno.h> | 9 | #include <asm/errno.h> |
| 8 | #include <asm/of_device.h> | 10 | #include <asm/of_device.h> |
| 9 | 11 | ||