diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-14 20:31:54 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-14 20:31:54 -0400 |
| commit | 6dc6472581f693b5fc95aebedf67b4960fb85cf0 (patch) | |
| tree | 06a5a9a08519950575505273eabced331ed51405 /include/asm-x86/device.h | |
| parent | ee673eaa72d8d185012b1027a05e25aba18c267f (diff) | |
| parent | 8acd3a60bcca17c6d89c73cee3ad6057eb83ba1e (diff) | |
Merge commit 'origin'
Manual fixup of conflicts on:
arch/powerpc/include/asm/dcr-regs.h
drivers/net/ibm_newemac/core.h
Diffstat (limited to 'include/asm-x86/device.h')
| -rw-r--r-- | include/asm-x86/device.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-x86/device.h b/include/asm-x86/device.h index 3c034f48fdb0..1bece04c7d9d 100644 --- a/include/asm-x86/device.h +++ b/include/asm-x86/device.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | #ifndef _ASM_X86_DEVICE_H | 1 | #ifndef ASM_X86__DEVICE_H |
| 2 | #define _ASM_X86_DEVICE_H | 2 | #define ASM_X86__DEVICE_H |
| 3 | 3 | ||
| 4 | struct dev_archdata { | 4 | struct dev_archdata { |
| 5 | #ifdef CONFIG_ACPI | 5 | #ifdef CONFIG_ACPI |
| @@ -13,4 +13,4 @@ struct dma_mapping_ops *dma_ops; | |||
| 13 | #endif | 13 | #endif |
| 14 | }; | 14 | }; |
| 15 | 15 | ||
| 16 | #endif /* _ASM_X86_DEVICE_H */ | 16 | #endif /* ASM_X86__DEVICE_H */ |