diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-29 11:44:40 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-29 11:44:40 -0400 |
| commit | e64de3b96c1ba3c1de236a4a103ec21234a5849f (patch) | |
| tree | b4ed91858a3d353bd72e3be101433ac821759379 /drivers/char | |
| parent | dbfd5ccc057fbefb7247614741efbf96be0258c5 (diff) | |
| parent | 8f0d8163b50e01f398b14bcd4dc039ac5ab18d64 (diff) | |
Merge 3.7-rc3 into char-misc-next
This brings in the various 3.7-rc3 char fixes into char-misc-next.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/sonypi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c index 320debbe32f..9b4f0116ff2 100644 --- a/drivers/char/sonypi.c +++ b/drivers/char/sonypi.c | |||
| @@ -1456,7 +1456,7 @@ static int __devexit sonypi_remove(struct platform_device *dev) | |||
| 1456 | return 0; | 1456 | return 0; |
| 1457 | } | 1457 | } |
| 1458 | 1458 | ||
| 1459 | #ifdef CONFIG_PM | 1459 | #ifdef CONFIG_PM_SLEEP |
| 1460 | static int old_camera_power; | 1460 | static int old_camera_power; |
| 1461 | 1461 | ||
| 1462 | static int sonypi_suspend(struct device *dev) | 1462 | static int sonypi_suspend(struct device *dev) |