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
/
of_device.h
diff --git
a/arch/powerpc/include/asm/of_device.h
b/arch/powerpc/include/asm/of_device.h
index
a64debf
..
444e97e
100644
(file)
--- a/
arch/powerpc/include/asm/of_device.h
+++ b/
arch/powerpc/include/asm/of_device.h
@@
-12,9
+12,8
@@
*/
struct of_device
{
*/
struct of_device
{
- struct device_node *node; /* to be obsoleted */
- u64 dma_mask; /* DMA mask */
struct device dev; /* Generic device interface */
struct device dev; /* Generic device interface */
+ struct pdev_archdata archdata;
};
extern struct of_device *of_device_alloc(struct device_node *np,
};
extern struct of_device *of_device_alloc(struct device_node *np,