Patch from Marc Singer

Revised default configuration files.
Signed-off-by: NMarc Singer <elf@buici.com>
Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>