diff options
| author | Eric Anholt | 2010-08-02 04:23:53 +0200 |
|---|---|---|
| committer | Eric Anholt | 2010-08-02 04:34:47 +0200 |
| commit | 2bd34f6ca86b5a5f9b749624f73310820e7a93fd (patch) | |
| tree | 9e42100423e78f400412dfa974a6a13bac94d2c0 /arch/mips/kernel/vdso.c | |
| parent | agp/intel: Add actual definitions of the Sandybridge PTE caching bits. (diff) | |
| parent | Linux 2.6.35 (diff) | |
| download | kernel-qcow2-linux-2bd34f6ca86b5a5f9b749624f73310820e7a93fd.tar.gz kernel-qcow2-linux-2bd34f6ca86b5a5f9b749624f73310820e7a93fd.tar.xz kernel-qcow2-linux-2bd34f6ca86b5a5f9b749624f73310820e7a93fd.zip | |
Merge remote branch 'origin/master' into drm-intel-next
This resolves the conflict in the EDP code, which has been rather
popular to hack on recently.
Conflicts:
drivers/gpu/drm/i915/intel_dp.c
Diffstat (limited to 'arch/mips/kernel/vdso.c')
| -rw-r--r-- | arch/mips/kernel/vdso.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/mips/kernel/vdso.c b/arch/mips/kernel/vdso.c index b773c1112b14..e5cdfd603f8f 100644 --- a/arch/mips/kernel/vdso.c +++ b/arch/mips/kernel/vdso.c @@ -61,11 +61,9 @@ static int __init init_vdso(void) vunmap(vdso); - pr_notice("init_vdso successfull\n"); - return 0; } -device_initcall(init_vdso); +subsys_initcall(init_vdso); static unsigned long vdso_addr(unsigned long start) { |