Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 14030
b: refs/heads/master
c: c53ca78
h: refs/heads/master
v: v3
  • Loading branch information
Andrew Morton authored and Linus Torvalds committed Nov 14, 2005
1 parent bce908b commit 3902abb
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4c8d3d997ef3c0594350fba716529905b314287e
refs/heads/master: c53ca784dc3e72a17dc210bee0361e13ad83d4cd
2 changes: 1 addition & 1 deletion trunk/drivers/video/nvidia/nv_proto.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 3902abb

Please sign in to comment.