]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
Merge branch 'testing/bcmring' into next/cleanups
authorArnd Bergmann <arnd@arndb.de>
Mon, 13 Aug 2012 15:01:31 +0000 (17:01 +0200)
committerArnd Bergmann <arnd@arndb.de>
Mon, 13 Aug 2012 15:01:31 +0000 (17:01 +0200)
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 <arnd@arndb.de>
1  2 
drivers/mtd/nand/bcm_umi_nand.c

Simple merge