diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-10 18:51:06 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-10 18:51:06 -0500 |
| commit | 0811a433c61e85f895018239c4466a36311cd5de (patch) | |
| tree | 276933e518e5525d24ae37b02df2db9909679260 /arch/s390/kernel/vdso32/gettimeofday.S | |
| parent | c299030765292434b73572f9bcfe84951ff06614 (diff) | |
| parent | 3d14bdad40315b54470cb7812293d14c8af2bf7d (diff) | |
Merge branch 'linus' into core/iommu
Diffstat (limited to 'arch/s390/kernel/vdso32/gettimeofday.S')
| -rw-r--r-- | arch/s390/kernel/vdso32/gettimeofday.S | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/s390/kernel/vdso32/gettimeofday.S b/arch/s390/kernel/vdso32/gettimeofday.S index c32f29c3d70c..ad8acfc949fb 100644 --- a/arch/s390/kernel/vdso32/gettimeofday.S +++ b/arch/s390/kernel/vdso32/gettimeofday.S | |||
| @@ -13,10 +13,6 @@ | |||
| 13 | #include <asm/asm-offsets.h> | 13 | #include <asm/asm-offsets.h> |
| 14 | #include <asm/unistd.h> | 14 | #include <asm/unistd.h> |
| 15 | 15 | ||
| 16 | #include <asm/vdso.h> | ||
| 17 | #include <asm/asm-offsets.h> | ||
| 18 | #include <asm/unistd.h> | ||
| 19 | |||
| 20 | .text | 16 | .text |
| 21 | .align 4 | 17 | .align 4 |
| 22 | .globl __kernel_gettimeofday | 18 | .globl __kernel_gettimeofday |