diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-18 10:48:49 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-18 10:48:49 -0500 |
| commit | 73f56c0d35e6427081a4eabd620d8b8d8a35bd09 (patch) | |
| tree | 9fe1a2577baea03f3a6ec4a5e79f3ff26c4ee0ae /include/video/atmel_lcdc.h | |
| parent | 0af40a4b1050c050e62eb1dc30b82d5ab22bf221 (diff) | |
| parent | 8501c45cc32c311ae755a2d5ac8c4a5f04908d42 (diff) | |
Merge branch 'iommu-fixes-2.6.28' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu into x86/urgent
Diffstat (limited to 'include/video/atmel_lcdc.h')
| -rw-r--r-- | include/video/atmel_lcdc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/video/atmel_lcdc.h b/include/video/atmel_lcdc.h index 6ad87f485992..0c864db1a466 100644 --- a/include/video/atmel_lcdc.h +++ b/include/video/atmel_lcdc.h | |||
| @@ -38,7 +38,7 @@ struct atmel_lcdfb_info { | |||
| 38 | spinlock_t lock; | 38 | spinlock_t lock; |
| 39 | struct fb_info *info; | 39 | struct fb_info *info; |
| 40 | void __iomem *mmio; | 40 | void __iomem *mmio; |
| 41 | unsigned long irq_base; | 41 | int irq_base; |
| 42 | struct work_struct task; | 42 | struct work_struct task; |
| 43 | 43 | ||
| 44 | unsigned int guard_time; | 44 | unsigned int guard_time; |