diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-15 20:56:07 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-15 20:56:07 -0500 |
| commit | 77ed78e5cf32be1c3fae5c477cc1d78e2e3f17db (patch) | |
| tree | 805db8c5c180ee7ee85b3c484461100c91f6c781 /drivers/video/nvidia/nv_proto.h | |
| parent | 68bdbdf0b32566e1ebd41415bde9a7c43b47bf48 (diff) | |
| parent | f6ff56cd56b83d8edf4b3cffc5c53c56b37a5081 (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/video/nvidia/nv_proto.h')
| -rw-r--r-- | drivers/video/nvidia/nv_proto.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/nvidia/nv_proto.h b/drivers/video/nvidia/nv_proto.h index f60b1f432270..3353103e8b0b 100644 --- a/drivers/video/nvidia/nv_proto.h +++ b/drivers/video/nvidia/nv_proto.h | |||
| @@ -42,7 +42,7 @@ int nvidia_probe_i2c_connector(struct fb_info *info, int conn, | |||
| 42 | #define nvidia_probe_i2c_connector(p, c, edid) (-1) | 42 | #define nvidia_probe_i2c_connector(p, c, edid) (-1) |
| 43 | #endif | 43 | #endif |
| 44 | 44 | ||
| 45 | #ifdef CONFIG_FB_OF | 45 | #ifdef CONFIG_PPC_OF |
| 46 | int nvidia_probe_of_connector(struct fb_info *info, int conn, | 46 | int nvidia_probe_of_connector(struct fb_info *info, int conn, |
| 47 | u8 ** out_edid); | 47 | u8 ** out_edid); |
| 48 | #else | 48 | #else |