diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-12 21:23:51 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-12 21:23:51 +0200 |
| commit | c87ce65868bbf9bbea9c3f112ff8315302daf8f2 (patch) | |
| tree | dc4a038bf888bd78b75a23e120c7fa737960fedf /arch/powerpc/kernel/legacy_serial.c | |
| parent | lguest: Fix guest crash when CONFIG_X86_USE_3DNOW=y (diff) | |
| parent | [POWERPC] Move serial_dev_init to device_initcall() (diff) | |
| download | linux-c87ce65868bbf9bbea9c3f112ff8315302daf8f2.tar.xz linux-c87ce65868bbf9bbea9c3f112ff8315302daf8f2.zip | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
[POWERPC] Move serial_dev_init to device_initcall()
[POWERPC] Enable GENERIC_ISA_DMA if FSL_ULI1575 to fix compile issue
[POWERPC] cpm2: Fix off-by-one error in setbrg().
[PPC] 8xx: Fix r3 trashing due to 8MB TLB page instantiation
[POWERPC] 8{5,6}xx: Fix build issue with !CONFIG_PCI
Diffstat (limited to 'arch/powerpc/kernel/legacy_serial.c')
| -rw-r--r-- | arch/powerpc/kernel/legacy_serial.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/legacy_serial.c b/arch/powerpc/kernel/legacy_serial.c index cea8045ba40b..90fa11c72e1c 100644 --- a/arch/powerpc/kernel/legacy_serial.c +++ b/arch/powerpc/kernel/legacy_serial.c @@ -493,7 +493,7 @@ static int __init serial_dev_init(void) return platform_device_register(&serial_device); } -arch_initcall(serial_dev_init); +device_initcall(serial_dev_init); /* |