diff --git a/[refs] b/[refs] index 0e519bf6bec6..1cc42d0eedda 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6ae236c05d46f48ac3d002a8643cda422f6e79dd +refs/heads/master: 558bd3e8dc7a798c5c845f90cf038b9bbd2df2b8 diff --git a/trunk/include/linux/pm.h b/trunk/include/linux/pm.h index 03d7bb145311..97bcf23e045a 100644 --- a/trunk/include/linux/pm.h +++ b/trunk/include/linux/pm.h @@ -31,7 +31,6 @@ /* * Callbacks for platform drivers to implement. */ -extern void (*pm_idle)(void); extern void (*pm_power_off)(void); extern void (*pm_power_off_prepare)(void);