Commit b174ec2c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus 

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] kspd: ioctl needs a translation entry.
  [MIPS] Viper2: Remove defective support.
  [MIPS] Oprofile: Reset all performance registers for MIPS_MT_SMP configs
parents 8b9909de 0e6ee854

arch/mips/Kconfig

+0 −5
Original line number Diff line number Diff line
@@ -470,11 +470,6 @@ config MIPS_XXS1500 
	select SOC_AU1500

	select SYS_SUPPORTS_LITTLE_ENDIAN



config PNX8550_V2PCI

	bool "Philips PNX8550 based Viper2-PCI board"

	select PNX8550

	select SYS_SUPPORTS_LITTLE_ENDIAN



config PNX8550_JBS

	bool "Philips PNX8550 based JBS board"

	select PNX8550

arch/mips/configs/atlas_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ CONFIG_MIPS_ATLAS=y 
# CONFIG_MOMENCO_OCELOT_C is not set

# CONFIG_MOMENCO_OCELOT_G is not set

# CONFIG_MIPS_XXS1500 is not set

# CONFIG_PNX8550_V2PCI is not set

# CONFIG_PNX8550_JBS is not set

# CONFIG_PNX8550_STB810 is not set

# CONFIG_DDB5477 is not set

arch/mips/configs/bigsur_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ CONFIG_ZONE_DMA=y 
# CONFIG_MOMENCO_OCELOT_C is not set

# CONFIG_MOMENCO_OCELOT_G is not set

# CONFIG_MIPS_XXS1500 is not set

# CONFIG_PNX8550_V2PCI is not set

# CONFIG_PNX8550_JBS is not set

# CONFIG_PNX8550_STB810 is not set

# CONFIG_DDB5477 is not set

arch/mips/configs/capcella_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ CONFIG_ZONE_DMA=y 
# CONFIG_MOMENCO_OCELOT_C is not set

# CONFIG_MOMENCO_OCELOT_G is not set

# CONFIG_MIPS_XXS1500 is not set

# CONFIG_PNX8550_V2PCI is not set

# CONFIG_PNX8550_JBS is not set

# CONFIG_PNX8550_STB810 is not set

# CONFIG_DDB5477 is not set

arch/mips/configs/cobalt_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ CONFIG_MIPS_COBALT=y 
# CONFIG_MOMENCO_OCELOT_C is not set

# CONFIG_MOMENCO_OCELOT_G is not set

# CONFIG_MIPS_XXS1500 is not set

# CONFIG_PNX8550_V2PCI is not set

# CONFIG_PNX8550_JBS is not set

# CONFIG_PNX8550_STB810 is not set

# CONFIG_DDB5477 is not set