dect
/
linux-2.6
Archived
13
0
Fork 0
This repository has been archived on 2022-02-17. You can view files and clone it, but cannot push or open issues or pull requests.
linux-2.6/arch/mips/configs
Linus Torvalds cebfa85eb8 Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
Pull MIPS updates from Ralf Baechle:
 "The MIPS bits for 3.8.  This also includes a bunch fixes that were
  sitting in the linux-mips.org git tree for a long time.  This pull
  request contains updates to several OCTEON drivers and the board
  support code for BCM47XX, BCM63XX, XLP, XLR, XLS, lantiq, Loongson1B,
  updates to the SSB bus support, MIPS kexec code and adds support for
  kdump.

  When pulling this, there are two expected merge conflicts in
  include/linux/bcma/bcma_driver_chipcommon.h which are trivial to
  resolve, just remove the conflict markers and keep both alternatives."

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (90 commits)
  MIPS: PMC-Sierra Yosemite: Remove support.
  VIDEO: Newport Fix console crashes
  MIPS: wrppmc: Fix build of PCI code.
  MIPS: IP22/IP28: Fix build of EISA code.
  MIPS: RB532: Fix build of prom code.
  MIPS: PowerTV: Fix build.
  MIPS: IP27: Correct fucked grammar in ops-bridge.c
  MIPS: Highmem: Fix build error if CONFIG_DEBUG_HIGHMEM is disabled
  MIPS: Fix potencial corruption
  MIPS: Fix for warning from FPU emulation code
  MIPS: Handle COP3 Unusable exception as COP1X for FP emulation
  MIPS: Fix poweroff failure when HOTPLUG_CPU configured.
  MIPS: MT: Fix build with CONFIG_UIDGID_STRICT_TYPE_CHECKS=y
  MIPS: Remove unused smvp.h
  MIPS/EDAC: Improve OCTEON EDAC support.
  MIPS: OCTEON: Add definitions for OCTEON memory contoller registers.
  MIPS: OCTEON: Add OCTEON family definitions to octeon-model.h
  ata: pata_octeon_cf: Use correct byte order for DMA in when built little-endian.
  MIPS/OCTEON/ata: Convert pata_octeon_cf.c to use device tree.
  MIPS: Remove usage of CEVT_R4K_LIB config option.
  ...
2012-12-14 14:27:45 -08:00
..
ar7_defconfig netfilter: remove xt_NOTRACK 2012-09-03 13:36:40 +02:00
ath79_defconfig MIPS: add default configuration for ath79 2012-11-20 09:17:37 +01:00
bcm47xx_defconfig arch: Change defconfigs to point to g_mass_storage. 2012-11-08 16:00:52 +02:00
bcm63xx_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
bigsur_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
capcella_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
cavium_octeon_defconfig MIPS: Cavium: Update defconfig 2012-12-12 16:52:06 +01:00
cobalt_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
db1000_defconfig MIPS: Alchemy: use the OHCI platform driver 2012-10-22 11:29:04 -07:00
db1235_defconfig MIPS: Alchemy: update development boards defconfigs with USB platform drivers 2012-10-23 10:18:52 -07:00
decstation_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
e55_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
fuloong2e_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
gpr_defconfig MIPS: Alchemy: use the OHCI platform driver 2012-10-22 11:29:04 -07:00
ip22_defconfig netfilter: remove xt_NOTRACK 2012-09-03 13:36:40 +02:00
ip27_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
ip28_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
ip32_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
jazz_defconfig netfilter: remove xt_NOTRACK 2012-09-03 13:36:40 +02:00
jmr3927_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
lasat_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
lemote2f_defconfig MIPS: Fix build warnings on defconfigs 2011-05-19 09:55:49 +01:00
ls1b_defconfig MIPS: Loongson 1B: use ehci-platform instead of ehci-ls1x. 2012-10-22 11:14:24 -07:00
malta_defconfig netfilter: remove xt_NOTRACK 2012-09-03 13:36:40 +02:00
markeins_defconfig netfilter: remove xt_NOTRACK 2012-09-03 13:36:40 +02:00
mpc30x_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
msp71xx_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
mtx1_defconfig usb: gadget: patches for v3.8 2012-11-11 17:31:53 -08:00
nlm_xlp_defconfig Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus 2012-10-09 16:08:04 +09:00
nlm_xlr_defconfig netfilter: remove xt_NOTRACK 2012-09-03 13:36:40 +02:00
pnx8335_stb225_defconfig MIPS: Replace `-' in defconfig filename wth `_' for consistency. 2012-09-26 22:00:05 +02:00
pnx8550_jbs_defconfig MIPS: Replace `-' in defconfig filename wth `_' for consistency. 2012-09-26 22:00:05 +02:00
pnx8550_stb810_defconfig MIPS: Replace `-' in defconfig filename wth `_' for consistency. 2012-09-26 22:00:05 +02:00
powertv_defconfig MIPS: PowerTV: Fix defconfigs for coverage builds 2012-02-20 18:33:20 +01:00
rb532_defconfig defconfigs: remove CONFIG_MTD_NAND_VERIFY_WRITE 2012-09-29 15:00:49 +01:00
rbtx49xx_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
rm200_defconfig netfilter: remove xt_NOTRACK 2012-09-03 13:36:40 +02:00
sb1250_swarm_defconfig MIPS: Replace `-' in defconfig filename wth `_' for consistency. 2012-09-26 22:00:05 +02:00
sead3_defconfig MIPS: Changes to configuration files for SEAD-3 platform. 2012-09-13 15:43:47 -05:00
tb0219_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
tb0226_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
tb0287_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
workpad_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00
wrppmc_defconfig kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT 2011-01-20 17:02:05 -08:00