On Mon, May 20, 2013 at 03:19:38PM -0700, David Daney wrote: > From: David Daney <david.daney@xxxxxxxxxx> > > CAVIUM_OCTEON_SOC most place we used to use CPU_CAVIUM_OCTEON. This > allows us to CPU_CAVIUM_OCTEON in places where we have no OCTEON SOC. > > Remove CAVIUM_OCTEON_SIMULATOR as it doesn't really do anything, we can > get the same configuration with CAVIUM_OCTEON_SOC. > > Signed-off-by: David Daney <david.daney@xxxxxxxxxx> > Cc: linux-ide@xxxxxxxxxxxxxxx > Cc: linux-edac@xxxxxxxxxxxxxxx > Cc: linux-i2c@xxxxxxxxxxxxxxx > Cc: netdev@xxxxxxxxxxxxxxx > Cc: spi-devel-general@xxxxxxxxxxxxxxxxxxxxx > Cc: devel@xxxxxxxxxxxxxxxxxxxx > Cc: linux-usb@xxxxxxxxxxxxxxx > --- Acked-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>