diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2011-01-14 12:09:49 -0700 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2011-01-14 12:09:49 -0700 |
commit | 42a9fa9957e369240936891c9a521ab671eed4e7 (patch) | |
tree | 7a9367594a367085c6a4a4433f687ec5c8dac8b7 /arch/powerpc/platforms/pseries/suspend.c | |
parent | 5f35765d836befebdfabf745fdbf2e070c887fac (diff) | |
parent | c289ef41431144a538b5fb5f94fc83c81b3020e2 (diff) |
Merge branch 'devicetree/next' into spi/next
Diffstat (limited to 'arch/powerpc/platforms/pseries/suspend.c')
-rw-r--r-- | arch/powerpc/platforms/pseries/suspend.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/pseries/suspend.c b/arch/powerpc/platforms/pseries/suspend.c index ed72098bb4e..a8ca289ff26 100644 --- a/arch/powerpc/platforms/pseries/suspend.c +++ b/arch/powerpc/platforms/pseries/suspend.c @@ -153,7 +153,7 @@ static struct sysdev_class suspend_sysdev_class = { .name = "power", }; -static struct platform_suspend_ops pseries_suspend_ops = { +static const struct platform_suspend_ops pseries_suspend_ops = { .valid = suspend_valid_only_mem, .begin = pseries_suspend_begin, .prepare_late = pseries_prepare_late, |