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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
[pandora-kernel.git]
/
arch
/
powerpc
/
include
/
asm
/
macio.h
diff --git
a/arch/powerpc/include/asm/macio.h
b/arch/powerpc/include/asm/macio.h
index
a062c57
..
19a661b
100644
(file)
--- a/
arch/powerpc/include/asm/macio.h
+++ b/
arch/powerpc/include/asm/macio.h
@@
-108,7
+108,7
@@
static inline void* macio_get_drvdata(struct macio_dev *dev)
static inline struct device_node *macio_get_of_node(struct macio_dev *mdev)
{
- return mdev->ofdev.node;
+ return mdev->ofdev.
dev.of_
node;
}
#ifdef CONFIG_PCI