git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drm/radeon/rv740: fix backend setup
[safe/jmp/linux-2.6]
/
drivers
/
video
/
riva
/
fbdev.c
diff --git
a/drivers/video/riva/fbdev.c
b/drivers/video/riva/fbdev.c
index
19dff8d
..
d94c57f
100644
(file)
--- a/
drivers/video/riva/fbdev.c
+++ b/
drivers/video/riva/fbdev.c
@@
-56,10
+56,6
@@
#include "rivafb.h"
#include "nvreg.h"
#include "rivafb.h"
#include "nvreg.h"
-#ifndef CONFIG_PCI /* sanity check */
-#error This driver requires PCI support.
-#endif
-
/* version number of this driver */
#define RIVAFB_VERSION "0.9.5b"
/* version number of this driver */
#define RIVAFB_VERSION "0.9.5b"
@@
-74,14
+70,14
@@
#define NVTRACE if(0) printk
#endif
#define NVTRACE if(0) printk
#endif
-#define NVTRACE_ENTER(...) NVTRACE("%s START\n", __
FUNCTION
__)
-#define NVTRACE_LEAVE(...) NVTRACE("%s END\n", __
FUNCTION
__)
+#define NVTRACE_ENTER(...) NVTRACE("%s START\n", __
func
__)
+#define NVTRACE_LEAVE(...) NVTRACE("%s END\n", __
func
__)
#ifdef CONFIG_FB_RIVA_DEBUG
#define assert(expr) \
if(!(expr)) { \
printk( "Assertion failed! %s,%s,%s,line=%d\n",\
#ifdef CONFIG_FB_RIVA_DEBUG
#define assert(expr) \
if(!(expr)) { \
printk( "Assertion failed! %s,%s,%s,line=%d\n",\
- #expr,__FILE__,__
FUNCTION
__,__LINE__); \
+ #expr,__FILE__,__
func
__,__LINE__); \
BUG(); \
}
#else
BUG(); \
}
#else
@@
-307,7
+303,7
@@
static int riva_bl_get_level_brightness(struct riva_par *par,
static int riva_bl_update_status(struct backlight_device *bd)
{
static int riva_bl_update_status(struct backlight_device *bd)
{
- struct riva_par *par =
class_get_devdata(&bd->class_dev
);
+ struct riva_par *par =
bl_get_data(bd
);
U032 tmp_pcrt, tmp_pmc;
int level;
U032 tmp_pcrt, tmp_pmc;
int level;
@@
-1760,13
+1756,13
@@
static int __devinit riva_get_EDID_OF(struct fb_info *info, struct pci_dev *pd)
NVTRACE_ENTER();
dp = pci_device_to_OF_node(pd);
for (; dp != NULL; dp = dp->child) {
NVTRACE_ENTER();
dp = pci_device_to_OF_node(pd);
for (; dp != NULL; dp = dp->child) {
- disptype = get_property(dp, "display-type", NULL);
+ disptype =
of_
get_property(dp, "display-type", NULL);
if (disptype == NULL)
continue;
if (strncmp(disptype, "LCD", 3) != 0)
continue;
for (i = 0; propnames[i] != NULL; ++i) {
if (disptype == NULL)
continue;
if (strncmp(disptype, "LCD", 3) != 0)
continue;
for (i = 0; propnames[i] != NULL; ++i) {
- pedid = get_property(dp, propnames[i], NULL);
+ pedid =
of_
get_property(dp, propnames[i], NULL);
if (pedid != NULL) {
par->EDID = (unsigned char *)pedid;
NVTRACE("LCD found.\n");
if (pedid != NULL) {
par->EDID = (unsigned char *)pedid;
NVTRACE("LCD found.\n");
@@
-2146,7
+2142,7
@@
static void __devexit rivafb_remove(struct pci_dev *pd)
* ------------------------------------------------------------------------- */
#ifndef MODULE
* ------------------------------------------------------------------------- */
#ifndef MODULE
-static int __init rivafb_setup(char *options)
+static int __
dev
init rivafb_setup(char *options)
{
char *this_opt;
{
char *this_opt;
@@
-2213,14
+2209,12
@@
static int __devinit rivafb_init(void)
module_init(rivafb_init);
module_init(rivafb_init);
-#ifdef MODULE
static void __exit rivafb_exit(void)
{
pci_unregister_driver(&rivafb_driver);
}
module_exit(rivafb_exit);
static void __exit rivafb_exit(void)
{
pci_unregister_driver(&rivafb_driver);
}
module_exit(rivafb_exit);
-#endif /* MODULE */
module_param(noaccel, bool, 0);
MODULE_PARM_DESC(noaccel, "bool: disable acceleration");
module_param(noaccel, bool, 0);
MODULE_PARM_DESC(noaccel, "bool: disable acceleration");