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 commit 'v2.6.31-rc7' into x86/cpu
[pandora-kernel.git]
/
drivers
/
eisa
/
virtual_root.c
diff --git
a/drivers/eisa/virtual_root.c
b/drivers/eisa/virtual_root.c
index
3074879
..
535e4f9
100644
(file)
--- a/
drivers/eisa/virtual_root.c
+++ b/
drivers/eisa/virtual_root.c
@@
-57,7
+57,7
@@
static int __init virtual_eisa_root_init (void)
eisa_bus_root.force_probe = force_probe;
-
eisa_root_dev.dev.driver_data = &eisa_bus_root
;
+
dev_set_drvdata(&eisa_root_dev.dev, &eisa_bus_root)
;
if (eisa_root_register (&eisa_bus_root)) {
/* A real bridge may have been registered before