ARM: bcm: tidy up a few includes

Clean up a few header file includes, eliminating a few that are not
really needed and putting in their place some that are.

Signed-off-by: Alex Elder <elder@linaro.org>
Reviewed-by: Matt Porter <mporter@linaro.org>
Signed-off-by: Matt Porter <mporter@linaro.org>

diff --cc arch/arm/mach-bcm/board_bcm21664.c
Simple merge

diff --cc arch/arm/mach-bcm/kona.c
Simple merge

diff --cc arch/arm/mach-bcm/kona.h
Simple merge