diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-04 02:52:14 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-04 02:52:14 -0500 |
| commit | cb9c34e6d090d376b77becaa5d29a65dec7f4272 (patch) | |
| tree | 3678abce20d6825aebe3fec218057d4131e13fd6 /include/video/atmel_lcdc.h | |
| parent | 470c66239ef0336429b35345f3f615d47341e13b (diff) | |
| parent | 061e41fdb5047b1fb161e89664057835935ca1d2 (diff) | |
Merge commit 'v2.6.28-rc7' into core/locking
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; |