projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'v2.6.33-rc5' into secretlab/test-devicetree
[cascardo/linux.git]
/
drivers
/
video
/
aty
/
atyfb_base.c
diff --git
a/drivers/video/aty/atyfb_base.c
b/drivers/video/aty/atyfb_base.c
index
1ddeb4c
..
5f1b580
100644
(file)
--- a/
drivers/video/aty/atyfb_base.c
+++ b/
drivers/video/aty/atyfb_base.c
@@
-3104,7
+3104,7
@@
static int __devinit atyfb_setup_sparc(struct pci_dev *pdev,
}
dp = pci_device_to_OF_node(pdev);
}
dp = pci_device_to_OF_node(pdev);
- if (node == dp->
nod
e) {
+ if (node == dp->
phandl
e) {
struct fb_var_screeninfo *var = &default_var;
unsigned int N, P, Q, M, T, R;
u32 v_total, h_total;
struct fb_var_screeninfo *var = &default_var;
unsigned int N, P, Q, M, T, R;
u32 v_total, h_total;