git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
drivers
/
video
/
riva
/
fbdev.c
diff --git
a/drivers/video/riva/fbdev.c
b/drivers/video/riva/fbdev.c
index
3e9308f
..
6c19ab6
100644
(file)
--- a/
drivers/video/riva/fbdev.c
+++ b/
drivers/video/riva/fbdev.c
@@
-49,7
+49,6
@@
#include <asm/pci-bridge.h>
#endif
#ifdef CONFIG_PMAC_BACKLIGHT
#include <asm/pci-bridge.h>
#endif
#ifdef CONFIG_PMAC_BACKLIGHT
-#include <asm/machdep.h>
#include <asm/backlight.h>
#endif
#include <asm/backlight.h>
#endif
@@
-1248,7
+1247,7
@@
static int rivafb_blank(int blank, struct fb_info *info)
CRTCout(par, 0x1a, vesa);
#ifdef CONFIG_PMAC_BACKLIGHT
CRTCout(par, 0x1a, vesa);
#ifdef CONFIG_PMAC_BACKLIGHT
- if ( par->FlatPanel &&
machine_is(powermac)
) {
+ if ( par->FlatPanel &&
_machine == _MACH_Pmac
) {
set_backlight_enable(!blank);
}
#endif
set_backlight_enable(!blank);
}
#endif
@@
-2038,9
+2037,9
@@
static int __devinit rivafb_probe(struct pci_dev *pd,
info->fix.smem_len / (1024 * 1024),
info->fix.smem_start);
#ifdef CONFIG_PMAC_BACKLIGHT
info->fix.smem_len / (1024 * 1024),
info->fix.smem_start);
#ifdef CONFIG_PMAC_BACKLIGHT
- if (default_par->FlatPanel &&
machine_is(powermac)
)
-
register_backlight_controller(&riva_backlight_controller,
- default_par, "mnca");
+ if (default_par->FlatPanel &&
_machine == _MACH_Pmac
)
+ register_backlight_controller(&riva_backlight_controller,
+
default_par, "mnca");
#endif
NVTRACE_LEAVE();
return 0;
#endif
NVTRACE_LEAVE();
return 0;
@@
-2073,6
+2072,8
@@
static void __exit rivafb_remove(struct pci_dev *pd)
struct riva_par *par = info->par;
NVTRACE_ENTER();
struct riva_par *par = info->par;
NVTRACE_ENTER();
+ if (!info)
+ return;
#ifdef CONFIG_FB_RIVA_I2C
riva_delete_i2c_busses(par);
#ifdef CONFIG_FB_RIVA_I2C
riva_delete_i2c_busses(par);