diff options
| author | Olof Johansson <olof@lixom.net> | 2012-11-06 06:48:05 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-11-06 06:48:05 -0800 |
| commit | 3b19119b95a52200c8ae3df3aa89c21c9a1a8894 (patch) | |
| tree | 3ae74b8a35b3d1f639a68c1690af1c06e14a1571 /drivers/char/sonypi.c | |
| parent | ccb1cfcb964fa8a8acd58b7783b2e82d7ad7975b (diff) | |
| parent | e095c0d122c09efabe7d4136ce77f72c636c4879 (diff) | |
| download | talos-op-linux-3b19119b95a52200c8ae3df3aa89c21c9a1a8894.tar.gz talos-op-linux-3b19119b95a52200c8ae3df3aa89c21c9a1a8894.zip | |
Merge tag 'calxeda-ecx-2000' of git://sources.calxeda.com/kernel/linux into next/soc
Support for Calxeda ECX-2000 SOC from Rob Herring
* tag 'calxeda-ecx-2000' of git://sources.calxeda.com/kernel/linux:
ARM: highbank: Add initial ECX-2000 support
ARM: highbank: abstract out SCU usage
ARM: smp_twd: don't warn on no DT node
ARM: dts: Add Calxeda ECX-2000 support
ARM: highbank: enable coherent DMA for xgmac in dts
ARM: highbank: disable unused sdhci and gpio in dts
+ sync to Linux 3.7-rc3
Diffstat (limited to 'drivers/char/sonypi.c')
| -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 320debbe32fa..9b4f0116ff21 100644 --- a/drivers/char/sonypi.c +++ b/drivers/char/sonypi.c @@ -1456,7 +1456,7 @@ static int __devexit sonypi_remove(struct platform_device *dev) return 0; } -#ifdef CONFIG_PM +#ifdef CONFIG_PM_SLEEP static int old_camera_power; static int sonypi_suspend(struct device *dev) |
