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/pxafb.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/pxafb.c')
| -rw-r--r-- | drivers/video/pxafb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c index 287aa1d2a13c..07b371b4b072 100644 --- a/drivers/video/pxafb.c +++ b/drivers/video/pxafb.c | |||
| @@ -2229,7 +2229,7 @@ static int __devexit pxafb_remove(struct platform_device *dev) | |||
| 2229 | 2229 | ||
| 2230 | static struct platform_driver pxafb_driver = { | 2230 | static struct platform_driver pxafb_driver = { |
| 2231 | .probe = pxafb_probe, | 2231 | .probe = pxafb_probe, |
| 2232 | .remove = pxafb_remove, | 2232 | .remove = __devexit_p(pxafb_remove), |
| 2233 | .suspend = pxafb_suspend, | 2233 | .suspend = pxafb_suspend, |
| 2234 | .resume = pxafb_resume, | 2234 | .resume = pxafb_resume, |
| 2235 | .driver = { | 2235 | .driver = { |