From: Arnd Bergmann Date: Mon, 13 Aug 2012 15:01:31 +0000 (+0200) Subject: Merge branch 'testing/bcmring' into next/cleanups X-Git-Tag: archive/raspbian/4.9.13-1+rpi1~10^2~10283^2~28 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a4c75ba85cecd7ee3a54737af28836567efa7448;p=linux-4.9.git Merge branch 'testing/bcmring' into next/cleanups This attempts to get the bcmring platform better in line with the other platforms. Moving the header files below mach/ helps with the future reorganization for multiplatform kernels, and using MMIO accessors is generally the right thing. * testing/bcmring: ARM: bcmring: use proper MMIO accessors ARM: bcmring: remove include/csp/ subdir ARM: bcmring: move cfg_global header to mach/ Signed-off-by: Arnd Bergmann --- a4c75ba85cecd7ee3a54737af28836567efa7448