diff options
Diffstat (limited to 'drivers/video/nvidia/nv_proto.h')
-rw-r--r-- | drivers/video/nvidia/nv_proto.h | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/drivers/video/nvidia/nv_proto.h b/drivers/video/nvidia/nv_proto.h index cac44fc7f587..f60b1f432270 100644 --- a/drivers/video/nvidia/nv_proto.h +++ b/drivers/video/nvidia/nv_proto.h | |||
@@ -31,7 +31,7 @@ int NVShowHideCursor(struct nvidia_par *par, int); | |||
31 | void NVLockUnlock(struct nvidia_par *par, int); | 31 | void NVLockUnlock(struct nvidia_par *par, int); |
32 | 32 | ||
33 | /* in nvidia-i2c.c */ | 33 | /* in nvidia-i2c.c */ |
34 | #if defined(CONFIG_FB_NVIDIA_I2C) || defined (CONFIG_PPC_OF) | 34 | #ifdef CONFIG_FB_NVIDIA_I2C |
35 | void nvidia_create_i2c_busses(struct nvidia_par *par); | 35 | void nvidia_create_i2c_busses(struct nvidia_par *par); |
36 | void nvidia_delete_i2c_busses(struct nvidia_par *par); | 36 | void nvidia_delete_i2c_busses(struct nvidia_par *par); |
37 | int nvidia_probe_i2c_connector(struct fb_info *info, int conn, | 37 | int nvidia_probe_i2c_connector(struct fb_info *info, int conn, |
@@ -39,10 +39,18 @@ int nvidia_probe_i2c_connector(struct fb_info *info, int conn, | |||
39 | #else | 39 | #else |
40 | #define nvidia_create_i2c_busses(...) | 40 | #define nvidia_create_i2c_busses(...) |
41 | #define nvidia_delete_i2c_busses(...) | 41 | #define nvidia_delete_i2c_busses(...) |
42 | #define nvidia_probe_i2c_connector(p, c, edid) \ | 42 | #define nvidia_probe_i2c_connector(p, c, edid) (-1) |
43 | do { \ | 43 | #endif |
44 | *(edid) = NULL; \ | 44 | |
45 | } while(0) | 45 | #ifdef CONFIG_FB_OF |
46 | int nvidia_probe_of_connector(struct fb_info *info, int conn, | ||
47 | u8 ** out_edid); | ||
48 | #else | ||
49 | static inline int nvidia_probe_of_connector(struct fb_info *info, int conn, | ||
50 | u8 ** out_edid) | ||
51 | { | ||
52 | return -1; | ||
53 | } | ||
46 | #endif | 54 | #endif |
47 | 55 | ||
48 | /* in nv_accel.c */ | 56 | /* in nv_accel.c */ |