diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-31 12:03:42 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-31 12:03:42 -0700 |
| commit | e4ca714b6363bbb4c8a6020482028815fc6d947f (patch) | |
| tree | 6581428d1d53b7c9ea37b1d617eee8592923e0a4 /arch/mips/configs/fuloong2e_defconfig | |
| parent | 50f5a1ee32ba2dd8f7221e4d841249edf81b9075 (diff) | |
| parent | c4fca4fdea940bda2cff6b844cda6af8ef1c79cc (diff) | |
| download | op-kernel-dev-e4ca714b6363bbb4c8a6020482028815fc6d947f.zip op-kernel-dev-e4ca714b6363bbb4c8a6020482028815fc6d947f.tar.gz | |
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/ralf/linux
Pull MIPS fixes from Ralf Baechle:
"MIPS fixes for 4.1 all across the tree"
* 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/ralf/linux:
MIPS: strnlen_user.S: Fix a CPU_DADDI_WORKAROUNDS regression
MIPS: BMIPS: Fix bmips_wr_vec()
MIPS: ath79: fix build problem if CONFIG_BLK_DEV_INITRD is not set
MIPS: Fuloong 2E: Replace CONFIG_USB_ISP1760_HCD by CONFIG_USB_ISP1760
MIPS: irq: Use DECLARE_BITMAP
ttyFDC: Fix to use native endian MMIO reads
MIPS: Fix CDMM to use native endian MMIO reads
Diffstat (limited to 'arch/mips/configs/fuloong2e_defconfig')
| -rw-r--r-- | arch/mips/configs/fuloong2e_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/configs/fuloong2e_defconfig b/arch/mips/configs/fuloong2e_defconfig index 0026806..b2a577e 100644 --- a/arch/mips/configs/fuloong2e_defconfig +++ b/arch/mips/configs/fuloong2e_defconfig @@ -194,7 +194,7 @@ CONFIG_USB_WUSB_CBAF=m CONFIG_USB_C67X00_HCD=m CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_ROOT_HUB_TT=y -CONFIG_USB_ISP1760_HCD=m +CONFIG_USB_ISP1760=m CONFIG_USB_OHCI_HCD=y CONFIG_USB_UHCI_HCD=m CONFIG_USB_R8A66597_HCD=m |
