diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-09-15 06:18:15 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-09-15 06:18:15 -0400 |
| commit | dca2d6ac09d9ef59ff46820d4f0c94b08a671202 (patch) | |
| tree | fdec753b842dad09e3a4151954fab3eb5c43500d /arch/arm/include/asm/device.h | |
| parent | d6a65dffb30d8636b1e5d4c201564ef401a246cf (diff) | |
| parent | 18240904960a39e582ced8ba8ececb10b8c22dd3 (diff) | |
Merge branch 'linus' into tracing/hw-breakpoints
Conflicts:
arch/x86/kernel/process_64.c
Semantic conflict fixed in:
arch/x86/kvm/x86.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/arm/include/asm/device.h')
| -rw-r--r-- | arch/arm/include/asm/device.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/include/asm/device.h b/arch/arm/include/asm/device.h index c61642b40603..9f390ce335cb 100644 --- a/arch/arm/include/asm/device.h +++ b/arch/arm/include/asm/device.h | |||
| @@ -12,4 +12,7 @@ struct dev_archdata { | |||
| 12 | #endif | 12 | #endif |
| 13 | }; | 13 | }; |
| 14 | 14 | ||
| 15 | struct pdev_archdata { | ||
| 16 | }; | ||
| 17 | |||
| 15 | #endif | 18 | #endif |