diff options
| author | Olof Johansson | 2013-01-14 19:20:02 +0100 |
|---|---|---|
| committer | Olof Johansson | 2013-01-14 19:20:02 +0100 |
| commit | 8d84981e395850aab31c3f2ca7e2738e03f671d7 (patch) | |
| tree | 933425fddb23d28be802277471df3fe3f6c2711d /arch/powerpc/sysdev/mv64x60_pci.c | |
| parent | Merge branch 'timer/cleanup' into next/cleanup (diff) | |
| parent | clocksource: use clockevents_config_and_register() where possible (diff) | |
| download | kernel-qcow2-linux-8d84981e395850aab31c3f2ca7e2738e03f671d7.tar.gz kernel-qcow2-linux-8d84981e395850aab31c3f2ca7e2738e03f671d7.tar.xz kernel-qcow2-linux-8d84981e395850aab31c3f2ca7e2738e03f671d7.zip | |
Merge branch 'clocksource/cleanup' into next/cleanup
Clockevent cleanup series from Shawn Guo.
Resolved move/change conflict in mach-pxa/time.c due to the sys_timer
cleanup.
* clocksource/cleanup:
clocksource: use clockevents_config_and_register() where possible
ARM: use clockevents_config_and_register() where possible
clockevents: export clockevents_config_and_register for module use
+ sync to Linux 3.8-rc3
Signed-off-by: Olof Johansson <olof@lixom.net>
Conflicts:
arch/arm/mach-pxa/time.c
Diffstat (limited to 'arch/powerpc/sysdev/mv64x60_pci.c')
| -rw-r--r-- | arch/powerpc/sysdev/mv64x60_pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/sysdev/mv64x60_pci.c b/arch/powerpc/sysdev/mv64x60_pci.c index 364b14d4754b..330d56613c5a 100644 --- a/arch/powerpc/sysdev/mv64x60_pci.c +++ b/arch/powerpc/sysdev/mv64x60_pci.c @@ -104,7 +104,7 @@ subsys_initcall(mv64x60_sysfs_init); #endif /* CONFIG_SYSFS */ -static void __devinit mv64x60_pci_fixup_early(struct pci_dev *dev) +static void mv64x60_pci_fixup_early(struct pci_dev *dev) { /* * Set the host bridge hdr_type to an invalid value so that |