diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-13 17:44:51 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-13 17:44:51 -0400 |
| commit | 97fb44eb6bc01f4ffed4300e475aa15e44877375 (patch) | |
| tree | 481ed6efd0babe7185cae04f2fd295426b36411d /drivers/video/bfin-t350mcqb-fb.c | |
| parent | e4707dd3e9d0cb57597b6568a5e51fea5d6fca41 (diff) | |
| parent | 148854c65ea8046b045672fd49f4333aefaa3ab5 (diff) | |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel
Conflicts:
arch/arm/mach-at91/gpio.c
Diffstat (limited to 'drivers/video/bfin-t350mcqb-fb.c')
| -rw-r--r-- | drivers/video/bfin-t350mcqb-fb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/bfin-t350mcqb-fb.c b/drivers/video/bfin-t350mcqb-fb.c index 2a423d3a2a8e..90cfddabf1f7 100644 --- a/drivers/video/bfin-t350mcqb-fb.c +++ b/drivers/video/bfin-t350mcqb-fb.c | |||
| @@ -447,7 +447,7 @@ static irqreturn_t bfin_t350mcqb_irq_error(int irq, void *dev_id) | |||
| 447 | return IRQ_HANDLED; | 447 | return IRQ_HANDLED; |
| 448 | } | 448 | } |
| 449 | 449 | ||
| 450 | static int __init bfin_t350mcqb_probe(struct platform_device *pdev) | 450 | static int __devinit bfin_t350mcqb_probe(struct platform_device *pdev) |
| 451 | { | 451 | { |
| 452 | struct bfin_t350mcqbfb_info *info; | 452 | struct bfin_t350mcqbfb_info *info; |
| 453 | struct fb_info *fbinfo; | 453 | struct fb_info *fbinfo; |