kevin/linux
1
Fork 0
Code
6618c3ada0
linux/arch/arm
History
Ryan Mallon 6618c3ada0 ARM: 6930/1: SPEAr3xx: Rework pmx_dev code to remove conflicts 
Prefix the pmx_devs to remove naming conflicts between the three
SPEAr3xx platforms. Also make pmx_driver static to each platform and
rework the init code to pass the devices rather than export the
pmx_driver structure.

Reviewed-by: Stanley Miao <stanley.miao@windriver.com>
Signed-off-by: Ryan Mallon <ryan@bluewatersys.com>
Signed-off-by: Viresh Kumar <viresh.kumar@st.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2011-05-20 22:34:24 +01:00
..
boot mmc: Add MMC_PROGRESS_* 2011-03-25 01:24:57 +09:00
common Merge branch 'misc' into devel 2011-03-16 23:35:25 +00:00
configs Merge branch 'for-linus' of git://android.git.kernel.org/kernel/tegra 2011-03-24 09:33:14 -07:00
include/asm Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm 2011-03-23 20:37:26 -07:00
kernel Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm 2011-03-23 20:37:26 -07:00
lib Merge branches 'fixes', 'pgt-next' and 'versatile' into devel 2011-03-20 09:32:12 +00:00
mach-at91 Merge branch 'p2v' into devel 2011-03-16 23:35:27 +00:00
mach-bcmring
mach-clps711x Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm 2011-03-16 19:03:06 -07:00
mach-cns3xxx
mach-davinci Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm 2011-03-17 19:08:06 -07:00
mach-dove Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm 2011-03-17 19:08:06 -07:00
mach-ebsa110
mach-ep93xx arm: ep93xx: Add basic interrupt info 2011-03-25 00:02:51 +01:00
mach-exynos4 Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm 2011-03-23 20:37:26 -07:00
mach-footbridge Merge branch 'p2v' into devel 2011-03-16 23:35:27 +00:00
mach-gemini Merge branch 'p2v' into devel 2011-03-16 23:35:27 +00:00
mach-h720x
mach-imx mfd: mfd_cell is now implicitly available to mc13xxx drivers 2011-03-23 10:41:54 +01:00
mach-integrator Merge branches 'fixes', 'pgt-next' and 'versatile' into devel 2011-03-20 09:32:12 +00:00
mach-iop13xx
mach-iop32x
mach-iop33x
mach-ixp4xx Merge branch 'p2v' into devel 2011-03-16 23:35:27 +00:00
mach-ixp23xx
mach-ixp2000
mach-kirkwood Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm 2011-03-17 19:08:06 -07:00
mach-ks8695
mach-l7200/include/mach
mach-loki Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm 2011-03-17 19:08:06 -07:00
mach-lpc32xx
mach-mmp ARM: pxa2xx: reorganize I2C files 2011-03-21 09:09:33 +00:00
mach-msm Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm 2011-03-23 20:37:26 -07:00
mach-mv78xx0 Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm 2011-03-17 19:08:06 -07:00
mach-mx3 mfd: mfd_cell is now implicitly available to mc13xxx drivers 2011-03-23 10:41:54 +01:00
mach-mx5
mach-mxc91231
mach-mxs Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx 2011-03-22 17:53:13 -07:00
mach-netx
mach-nomadik
mach-ns9xxx
mach-nuc93x
mach-omap1 Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 2011-03-17 19:28:15 -07:00
mach-omap2 Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 2011-03-24 09:50:13 -07:00
mach-orion5x Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm 2011-03-17 19:08:06 -07:00
mach-pnx4008
mach-pxa ARM: pxa2xx: reorganize I2C files 2011-03-21 09:09:33 +00:00
mach-realview Merge branches 'fixes', 'pgt-next' and 'versatile' into devel 2011-03-20 09:32:12 +00:00
mach-rpc
mach-s3c24a0/include/mach
mach-s3c64xx Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm 2011-03-17 19:08:06 -07:00
mach-s3c2400
mach-s3c2410 ARM: H1940/RX1950: Change default LED triggers 2011-03-21 23:29:43 +00:00
mach-s3c2412
mach-s3c2416
mach-s3c2440 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 2011-03-23 07:58:09 -07:00
mach-s3c2443
mach-s5p64x0 Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm 2011-03-17 19:08:06 -07:00
mach-s5p6442 Merge branch 'p2v' into devel 2011-03-16 23:35:27 +00:00
mach-s5pc100 Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm 2011-03-17 19:08:06 -07:00
mach-s5pv210 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 2011-03-19 22:27:06 -07:00
mach-sa1100 Merge branch 'p2v' into devel 2011-03-16 23:35:27 +00:00
mach-shark
mach-shmobile Merge branch 'rmobile-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 2011-03-24 10:04:59 -07:00
mach-spear3xx ARM: 6930/1: SPEAr3xx: Rework pmx_dev code to remove conflicts 2011-05-20 22:34:24 +01:00
mach-spear6xx ARM: 6926/1: SPEAr clock: Define common clk_init routine in plat/clock.c 2011-05-20 22:31:40 +01:00
mach-stmp37xx
mach-stmp378x
mach-tcc8k Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm 2011-03-17 19:08:06 -07:00
mach-tegra Merge branch 'for-linus' of git://android.git.kernel.org/kernel/tegra 2011-03-24 09:33:14 -07:00
mach-u300 Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm 2011-03-17 19:08:06 -07:00
mach-ux500 Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm 2011-03-23 20:37:26 -07:00
mach-versatile Merge branches 'fixes', 'pgt-next' and 'versatile' into devel 2011-03-20 09:32:12 +00:00
mach-vexpress ARM: 6771/1: vexpress: add support for multiple core tiles 2011-03-20 09:32:21 +00:00
mach-vt8500
mach-w90x900
mm lib, arch: add filter argument to show_mem and fix private implementations 2011-03-24 17:49:37 -07:00
nwfpe
oprofile
plat-iop
plat-mxc Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc 2011-03-18 22:32:40 -07:00
plat-nomadik arm/gpio: Remove three copies of broken and racy debug code 2011-03-25 00:02:51 +01:00
plat-omap Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 2011-03-24 09:50:13 -07:00
plat-orion
plat-pxa ARM: pxa2xx: reorganize I2C files 2011-03-21 09:09:33 +00:00
plat-s3c24xx Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm 2011-03-17 19:08:06 -07:00
plat-s5p ARM: EXYNOS4: Implement Clock gating for System MMU 2011-03-15 21:37:38 +09:00
plat-samsung Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm 2011-03-17 19:08:06 -07:00
plat-spear ARM: 6926/1: SPEAr clock: Define common clk_init routine in plat/clock.c 2011-05-20 22:31:40 +01:00
plat-stmp3xxx
plat-tcc
plat-versatile
tools ARM: Update (and cut down) mach-types 2011-03-20 18:07:44 +00:00
vfp Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 2011-03-20 18:14:55 -07:00
Kconfig Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm 2011-03-23 20:37:26 -07:00
Kconfig-nommu
Kconfig.debug
Makefile Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm 2011-03-17 19:08:06 -07:00