diff options
| author | Mark Brown <broonie@kernel.org> | 2014-09-18 10:49:37 -0700 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-09-18 10:49:37 -0700 |
| commit | e55574f93ecb78dac5a15f29d18f2ab4dbc813bc (patch) | |
| tree | ffce30ba6d6a11b3fdc5ebd28e5f3cca2d87d12c /arch/powerpc/platforms/pseries/hotplug-memory.c | |
| parent | 9ea00e4fa07ce46ab79c92087c72ae100de4de42 (diff) | |
| parent | d831fd1b46d04e5c8c8a0431c321578d25852695 (diff) | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-rtlsk-v3.10-rt-14.09
Diffstat (limited to 'arch/powerpc/platforms/pseries/hotplug-memory.c')
| -rw-r--r-- | arch/powerpc/platforms/pseries/hotplug-memory.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/pseries/hotplug-memory.c b/arch/powerpc/platforms/pseries/hotplug-memory.c index 9a432de363b8..bebe64ed5dc3 100644 --- a/arch/powerpc/platforms/pseries/hotplug-memory.c +++ b/arch/powerpc/platforms/pseries/hotplug-memory.c @@ -158,7 +158,7 @@ static int pseries_remove_memory(struct device_node *np) static inline int pseries_remove_memblock(unsigned long base, unsigned int memblock_size) { - return -EOPNOTSUPP; + return 0; } static inline int pseries_remove_memory(struct device_node *np) { |