git.karo-electronics.de Git - mv-sheeva.git/commit

author	Andrew Morton <akpm@osdl.org>
	Thu, 20 Apr 2006 20:41:18 +0000 (21:41 +0100)
committer	Russell King <rmk+kernel@arm.linux.org.uk>
	Thu, 20 Apr 2006 20:41:18 +0000 (21:41 +0100)
commit	1c97b73e89af9a20e99450c554cffdd9327e827a
tree	79578b028a0dd2303e150c55b841f2e32ad1388c	tree \| snapshot
parent	4b91ff4f425edb875c8e071d19a2417d23c578a4	commit \| diff

[ARM] add_memory() build fix

This is back again. Offending patch is x86_64-mm-hotadd-reserve.patch

arch/arm/kernel/setup.c:435: error: conflicting types for 'add_memory'
include/linux/memory_hotplug.h:102: error: previous declaration of 'add_memory' was here
arch/arm/kernel/setup.c:435: error: conflicting types for 'add_memory'
include/linux/memory_hotplug.h:102: error: previous declaration of 'add_memory' was here

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>