diff options
author | Greg KH <gregkh@suse.de> | 2005-09-12 12:45:04 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-09-12 12:45:04 -0700 |
commit | d58dde0f552a5c5c4485b962d8b6e9dd54fefb30 (patch) | |
tree | d9a7e35eb88fea6265d5aadcc3d4ed39122b052a /drivers/video/nvidia/nv_of.c | |
parent | 877599fdef5ea4a7dd1956e22fa9d6923add97f8 (diff) | |
parent | 2ade81473636b33aaac64495f89a7dc572c529f0 (diff) |
Merge ../torvalds-2.6/
Diffstat (limited to 'drivers/video/nvidia/nv_of.c')
-rw-r--r-- | drivers/video/nvidia/nv_of.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/video/nvidia/nv_of.c b/drivers/video/nvidia/nv_of.c index 7d12eb85310..4fa2cf9a8af 100644 --- a/drivers/video/nvidia/nv_of.c +++ b/drivers/video/nvidia/nv_of.c @@ -30,8 +30,9 @@ void nvidia_create_i2c_busses(struct nvidia_par *par) {} void nvidia_delete_i2c_busses(struct nvidia_par *par) {} -int nvidia_probe_i2c_connector(struct nvidia_par *par, int conn, u8 **out_edid) +int nvidia_probe_i2c_connector(struct fb_info *info, int conn, u8 **out_edid) { + struct nvidia_par *par = info->par; struct device_node *dp; unsigned char *pedid = NULL; unsigned char *disptype = NULL; |