diff options
Diffstat (limited to 'arch/x86/platform/iris/iris.c')
| -rw-r--r-- | arch/x86/platform/iris/iris.c | 5 | 
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/x86/platform/iris/iris.c b/arch/x86/platform/iris/iris.c index b42bfdab01a9..c5f3bbdbdcfe 100644 --- a/arch/x86/platform/iris/iris.c +++ b/arch/x86/platform/iris/iris.c @@ -62,11 +62,10 @@ static int iris_probe(struct platform_device *pdev)  	return 0;  } -static int iris_remove(struct platform_device *pdev) +static void iris_remove(struct platform_device *pdev)  {  	pm_power_off = old_pm_power_off;  	printk(KERN_INFO "Iris power_off handler uninstalled.\n"); -	return 0;  }  static struct platform_driver iris_driver = { @@ -74,7 +73,7 @@ static struct platform_driver iris_driver = {  		.name   = "iris",  	},  	.probe          = iris_probe, -	.remove         = iris_remove, +	.remove_new     = iris_remove,  };  static struct resource iris_resources[] = {  |