diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-18 17:14:17 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-18 17:14:17 -0400 |
| commit | 28af493cd7b89cba7e3ee534079cf4f41bb4b4f9 (patch) | |
| tree | ea27df5ab7b728496a15602e0a7da74ff188378f /include/asm-arm/arch-pxa/pxafb.h | |
| parent | 74cfe03f80adc320bde4dd37616354aefe2271aa (diff) | |
| parent | 39ca371c45b04cd50d0974030ae051906fc516b6 (diff) | |
Merge branch 'master'
Diffstat (limited to 'include/asm-arm/arch-pxa/pxafb.h')
| -rw-r--r-- | include/asm-arm/arch-pxa/pxafb.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-arm/arch-pxa/pxafb.h b/include/asm-arm/arch-pxa/pxafb.h index 21c0e16dce5f..aba9b30f4249 100644 --- a/include/asm-arm/arch-pxa/pxafb.h +++ b/include/asm-arm/arch-pxa/pxafb.h | |||
| @@ -66,4 +66,5 @@ struct pxafb_mach_info { | |||
| 66 | 66 | ||
| 67 | }; | 67 | }; |
| 68 | void set_pxa_fb_info(struct pxafb_mach_info *hard_pxa_fb_info); | 68 | void set_pxa_fb_info(struct pxafb_mach_info *hard_pxa_fb_info); |
| 69 | void set_pxa_fb_parent(struct device *parent_dev); | ||
| 69 | unsigned long pxafb_get_hsync_time(struct device *dev); | 70 | unsigned long pxafb_get_hsync_time(struct device *dev); |