diff options
Diffstat (limited to 'arch/x86/platform/olpc/olpc-xo15-sci.c')
| -rw-r--r-- | arch/x86/platform/olpc/olpc-xo15-sci.c | 6 | 
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/x86/platform/olpc/olpc-xo15-sci.c b/arch/x86/platform/olpc/olpc-xo15-sci.c index 23e5b9d7977..599be499fdf 100644 --- a/arch/x86/platform/olpc/olpc-xo15-sci.c +++ b/arch/x86/platform/olpc/olpc-xo15-sci.c @@ -203,7 +203,7 @@ static int xo15_sci_remove(struct acpi_device *device, int type)  	return 0;  } -static int xo15_sci_resume(struct acpi_device *device) +static int xo15_sci_resume(struct device *dev)  {  	/* Enable all EC events */  	olpc_ec_mask_write(EC_SCI_SRC_ALL); @@ -215,6 +215,8 @@ static int xo15_sci_resume(struct acpi_device *device)  	return 0;  } +static SIMPLE_DEV_PM_OPS(xo15_sci_pm, NULL, xo15_sci_resume); +  static const struct acpi_device_id xo15_sci_device_ids[] = {  	{"XO15EC", 0},  	{"", 0}, @@ -227,8 +229,8 @@ static struct acpi_driver xo15_sci_drv = {  	.ops = {  		.add = xo15_sci_add,  		.remove = xo15_sci_remove, -		.resume = xo15_sci_resume,  	}, +	.drv.pm = &xo15_sci_pm,  };  static int __init xo15_sci_init(void)  |