diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-11-13 20:28:58 -0800 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-11-13 20:28:58 -0800 |
| commit | 7b0a65f9923ffe7885a5473648baaa3a1a701726 (patch) | |
| tree | b9be4a0504b4e637b86bdc92d88268ff57ea1bc5 /drivers/video/nvidia/nv_proto.h | |
| parent | 1b98a8221e3c9c86ae7e292ba7542d2dd6f10eb9 (diff) | |
| parent | ee90f62b3e69d0cd9f8edc6b95f07b1a8c38aaf4 (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
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 f60b1f43227..3353103e8b0 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, #define nvidia_probe_i2c_connector(p, c, edid) (-1) #endif -#ifdef CONFIG_FB_OF +#ifdef CONFIG_PPC_OF int nvidia_probe_of_connector(struct fb_info *info, int conn, u8 ** out_edid); #else |