From 22d85e5d6429d7c6328a9bf14a7fbf95dbee643d Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Thu, 31 Mar 2011 12:03:51 +0300 Subject: [PATCH] --- yaml --- r: 251024 b: refs/heads/master c: 14e4d78485a50312be72a42fd42a28b5b34264dc h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/video/omap2/displays/panel-generic-dpi.c | 4 ++-- trunk/drivers/video/omap2/displays/panel-sharp-ls037v7dw01.c | 4 ++-- trunk/drivers/video/omap2/displays/panel-taal.c | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index adf57c1200c4..f6af428d7897 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 06b2b0d597ab6e3011e8215d02b2aa5f831efbc7 +refs/heads/master: 14e4d78485a50312be72a42fd42a28b5b34264dc diff --git a/trunk/drivers/video/omap2/displays/panel-generic-dpi.c b/trunk/drivers/video/omap2/displays/panel-generic-dpi.c index 2251f73f366d..27b9943eb48f 100644 --- a/trunk/drivers/video/omap2/displays/panel-generic-dpi.c +++ b/trunk/drivers/video/omap2/displays/panel-generic-dpi.c @@ -286,7 +286,7 @@ static int generic_dpi_panel_probe(struct omap_dss_device *dssdev) return 0; } -static void generic_dpi_panel_remove(struct omap_dss_device *dssdev) +static void __exit generic_dpi_panel_remove(struct omap_dss_device *dssdev) { struct panel_drv_data *drv_data = dev_get_drvdata(&dssdev->dev); @@ -359,7 +359,7 @@ static int generic_dpi_panel_check_timings(struct omap_dss_device *dssdev, static struct omap_dss_driver dpi_driver = { .probe = generic_dpi_panel_probe, - .remove = generic_dpi_panel_remove, + .remove = __exit_p(generic_dpi_panel_remove), .enable = generic_dpi_panel_enable, .disable = generic_dpi_panel_disable, diff --git a/trunk/drivers/video/omap2/displays/panel-sharp-ls037v7dw01.c b/trunk/drivers/video/omap2/displays/panel-sharp-ls037v7dw01.c index bc142a0b0651..ba38b3ad17d6 100644 --- a/trunk/drivers/video/omap2/displays/panel-sharp-ls037v7dw01.c +++ b/trunk/drivers/video/omap2/displays/panel-sharp-ls037v7dw01.c @@ -120,7 +120,7 @@ static int sharp_ls_panel_probe(struct omap_dss_device *dssdev) return 0; } -static void sharp_ls_panel_remove(struct omap_dss_device *dssdev) +static void __exit sharp_ls_panel_remove(struct omap_dss_device *dssdev) { struct sharp_data *sd = dev_get_drvdata(&dssdev->dev); struct backlight_device *bl = sd->bl; @@ -205,7 +205,7 @@ static int sharp_ls_panel_resume(struct omap_dss_device *dssdev) static struct omap_dss_driver sharp_ls_driver = { .probe = sharp_ls_panel_probe, - .remove = sharp_ls_panel_remove, + .remove = __exit_p(sharp_ls_panel_remove), .enable = sharp_ls_panel_enable, .disable = sharp_ls_panel_disable, diff --git a/trunk/drivers/video/omap2/displays/panel-taal.c b/trunk/drivers/video/omap2/displays/panel-taal.c index ed46a1e99c47..83b0316e35ad 100644 --- a/trunk/drivers/video/omap2/displays/panel-taal.c +++ b/trunk/drivers/video/omap2/displays/panel-taal.c @@ -819,7 +819,7 @@ static int taal_probe(struct omap_dss_device *dssdev) return r; } -static void taal_remove(struct omap_dss_device *dssdev) +static void __exit taal_remove(struct omap_dss_device *dssdev) { struct taal_data *td = dev_get_drvdata(&dssdev->dev); struct nokia_dsi_panel_data *panel_data = get_panel_data(dssdev); @@ -1557,7 +1557,7 @@ static enum omap_dss_update_mode taal_get_update_mode( static struct omap_dss_driver taal_driver = { .probe = taal_probe, - .remove = taal_remove, + .remove = __exit_p(taal_remove), .enable = taal_enable, .disable = taal_disable,