summaryrefslogtreecommitdiff
path: root/arch/powerpc/configs
diff options
context:
space:
mode:
authorMichael Ellerman <mpe@ellerman.id.au>2015-06-19 10:23:48 +0300
committerMichael Ellerman <mpe@ellerman.id.au>2015-06-19 10:23:48 +0300
commit6096f884515466f400864ad23d16f20b731a7ce7 (patch)
tree8d0c6863daf21aa48f30e615e49263eded8db642 /arch/powerpc/configs
parentf293106917f6d1538c9c7779a632c2ab904a756b (diff)
parentf1b3b4450dcbfd0098b6fc3b00f4880701550c83 (diff)
downloadlinux-6096f884515466f400864ad23d16f20b731a7ce7.tar.xz
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux into next
Freescale updates from Scott: "Highlights include more 8xx optimizations, an e6500 hugetlb optimization, QMan device tree nodes, t1024/t1023 support, and various fixes and cleanup."
Diffstat (limited to 'arch/powerpc/configs')
-rw-r--r--arch/powerpc/configs/85xx/xes_mpc85xx_defconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/configs/85xx/xes_mpc85xx_defconfig b/arch/powerpc/configs/85xx/xes_mpc85xx_defconfig
index 34f3ea1729e0..858b539d004b 100644
--- a/arch/powerpc/configs/85xx/xes_mpc85xx_defconfig
+++ b/arch/powerpc/configs/85xx/xes_mpc85xx_defconfig
@@ -108,7 +108,7 @@ CONFIG_SENSORS_LM90=y
CONFIG_WATCHDOG=y
CONFIG_USB=y
CONFIG_USB_MON=y
-CONFIG_USB_ISP1760_HCD=y
+CONFIG_USB_ISP1760=y
CONFIG_USB_STORAGE=y
CONFIG_NEW_LEDS=y
CONFIG_LEDS_CLASS=y