diff options
| author | David S. Miller <davem@davemloft.net> | 2008-11-19 02:38:23 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-19 02:38:23 -0500 |
| commit | 198d6ba4d7f48c94f990f4604f0b3d73925e0ded (patch) | |
| tree | 56bbdf8ba2553c23c8099da9344a8f1d1aba97ab /include/video/atmel_lcdc.h | |
| parent | 9a57f7fabd383920585ed8b74eacd117c6551f2d (diff) | |
| parent | 7f0f598a0069d1ab072375965a4b69137233169c (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/isdn/i4l/isdn_net.c
fs/cifs/connect.c
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; |