diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2007-10-15 13:55:44 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-10-15 13:56:02 -0400 |
| commit | 0181b61a988424b5cc44fe09e6968142359c815e (patch) | |
| tree | 2575ee900a39ffaa169ad5aeb8aa6ddee11cfbe5 /drivers/video/pxafb.h | |
| parent | 92633b72d18ca4f25de1f28e436a882159491e7e (diff) | |
| parent | 87944f3361fc033b73617aa663135c6e468957a7 (diff) | |
Merge branch 'pxa' into devel
Diffstat (limited to 'drivers/video/pxafb.h')
| -rw-r--r-- | drivers/video/pxafb.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/video/pxafb.h b/drivers/video/pxafb.h index 7499a1c4bf79..f8605b807b0a 100644 --- a/drivers/video/pxafb.h +++ b/drivers/video/pxafb.h | |||
| @@ -40,6 +40,7 @@ struct pxafb_dma_descriptor { | |||
| 40 | struct pxafb_info { | 40 | struct pxafb_info { |
| 41 | struct fb_info fb; | 41 | struct fb_info fb; |
| 42 | struct device *dev; | 42 | struct device *dev; |
| 43 | struct clk *clk; | ||
| 43 | 44 | ||
| 44 | /* | 45 | /* |
| 45 | * These are the addresses we mapped | 46 | * These are the addresses we mapped |