CONFIG_HOTPLUG is going away as an option so __devexit is no longer needed. Signed-off-by: Bill Pemberton <wfp5p@xxxxxxxxxxxx> Cc: Julian Andres Klode <jak@xxxxxxxxxxxxx> Cc: Marc Dietrich <marvin24@xxxxxx> Cc: ac100@xxxxxxxxxxxxxxxxxxx Cc: devel@xxxxxxxxxxxxxxxxxxxx --- drivers/staging/nvec/nvec.c | 2 +- drivers/staging/nvec/nvec_kbd.c | 2 +- drivers/staging/nvec/nvec_paz00.c | 2 +- drivers/staging/nvec/nvec_power.c | 2 +- drivers/staging/nvec/nvec_ps2.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/staging/nvec/nvec.c b/drivers/staging/nvec/nvec.c index 7e71d7e..2830946 100644 --- a/drivers/staging/nvec/nvec.c +++ b/drivers/staging/nvec/nvec.c @@ -852,7 +852,7 @@ static int tegra_nvec_probe(struct platform_device *pdev) return 0; } -static int __devexit tegra_nvec_remove(struct platform_device *pdev) +static int tegra_nvec_remove(struct platform_device *pdev) { struct nvec_chip *nvec = platform_get_drvdata(pdev); diff --git a/drivers/staging/nvec/nvec_kbd.c b/drivers/staging/nvec/nvec_kbd.c index 9048d59..7cb149b 100644 --- a/drivers/staging/nvec/nvec_kbd.c +++ b/drivers/staging/nvec/nvec_kbd.c @@ -159,7 +159,7 @@ fail: return err; } -static int __devexit nvec_kbd_remove(struct platform_device *pdev) +static int nvec_kbd_remove(struct platform_device *pdev) { input_unregister_device(keys_dev.input); input_free_device(keys_dev.input); diff --git a/drivers/staging/nvec/nvec_paz00.c b/drivers/staging/nvec/nvec_paz00.c index 4ac17fb..934b796 100644 --- a/drivers/staging/nvec/nvec_paz00.c +++ b/drivers/staging/nvec/nvec_paz00.c @@ -72,7 +72,7 @@ static int nvec_paz00_probe(struct platform_device *pdev) return 0; } -static int __devexit nvec_paz00_remove(struct platform_device *pdev) +static int nvec_paz00_remove(struct platform_device *pdev) { struct nvec_led *led = platform_get_drvdata(pdev); diff --git a/drivers/staging/nvec/nvec_power.c b/drivers/staging/nvec/nvec_power.c index 6c702ed..b7b6d54 100644 --- a/drivers/staging/nvec/nvec_power.c +++ b/drivers/staging/nvec/nvec_power.c @@ -407,7 +407,7 @@ static int nvec_power_probe(struct platform_device *pdev) return power_supply_register(&pdev->dev, psy); } -static int __devexit nvec_power_remove(struct platform_device *pdev) +static int nvec_power_remove(struct platform_device *pdev) { struct nvec_power *power = platform_get_drvdata(pdev); diff --git a/drivers/staging/nvec/nvec_ps2.c b/drivers/staging/nvec/nvec_ps2.c index 59d8f5a..88dd288 100644 --- a/drivers/staging/nvec/nvec_ps2.c +++ b/drivers/staging/nvec/nvec_ps2.c @@ -123,7 +123,7 @@ static int nvec_mouse_probe(struct platform_device *pdev) return 0; } -static int __devexit nvec_mouse_remove(struct platform_device *pdev) +static int nvec_mouse_remove(struct platform_device *pdev) { serio_unregister_port(ps2_dev.ser_dev); -- 1.8.0 _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/devel