summaryrefslogtreecommitdiff
path: root/arch/parisc/Kconfig
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-11-13 00:59:38 +0400
committerArnd Bergmann <arnd@arndb.de>2012-11-13 00:59:38 +0400
commit63cd201e6559142b16dd2af8c911edd491bf6274 (patch)
treecece599b0180d5080d1d522514deb6bba6bce669 /arch/parisc/Kconfig
parent94c78a55b8404396e3b8d9463c1b5c562664c893 (diff)
parent12818d82ccad9868a820dbb193b4f9b797cd02d4 (diff)
downloadlinux-63cd201e6559142b16dd2af8c911edd491bf6274.tar.xz
Merge branch 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards2
* This pull request is based on a merge of a) The renesas/boards branch of the arm-soc tree b) The soc branch of the renesas tree, which I have sent a separate pull requst for * "sh: clkfwk: add sh_clk_fsidiv_register()" is a driver patch which is a dependency of - ARM: shmobile: sh7372: use sh_clk_fsidiv_register() for FSI-DIV clocks - ARM: shmobile: r8a7740: add FSI-DVI clocks I have spoken to the driver maintainer, Paul Mundt, and he has indicated that he thinks it is best to merge all in one go and acked the patch for inclusion in this pull-request. * The following patches - ARM: shmobile: use FSI driver's audio clock on ap4evb - ARM: shmobile: use FSI driver's audio clock on mackerel - ARM: shmobile: use FSI driver's audio clock on armadillo800eva Have a compile-time dependency on the following patch which is present in the for-next branch of Mark Brown's sound tree on kernel.org - ASoC: fsi: add master clock control functions (ab6f6d85210c4d0265cf48e9958c04e08595055a) * 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: use FSI driver's audio clock on ap4evb ARM: shmobile: use FSI driver's audio clock on mackerel ARM: shmobile: use FSI driver's audio clock on armadillo800eva ARM: shmobile: mackerel: enable DMAEngine on USB Host ARM: shmobile: marzen: add USB OHCI driver support ARM: shmobile: marzen: add USB EHCI driver support ARM: shmobile: marzen: add USB phy support Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/parisc/Kconfig')
0 files changed, 0 insertions, 0 deletions