git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
[pandora-kernel.git]
/
arch
/
powerpc
/
kernel
/
of_device.c
diff --git
a/arch/powerpc/kernel/of_device.c
b/arch/powerpc/kernel/of_device.c
index
3388ad6
..
5748ddb
100644
(file)
--- a/
arch/powerpc/kernel/of_device.c
+++ b/
arch/powerpc/kernel/of_device.c
@@
-5,10
+5,10
@@
#include <linux/module.h>
#include <linux/mod_devicetable.h>
#include <linux/slab.h>
+#include <linux/of_device.h>
#include <asm/errno.h>
#include <asm/dcr.h>
-#include <asm/of_device.h>
static void of_device_make_bus_id(struct of_device *dev)
{