diff options
| author | Len Brown <len.brown@intel.com> | 2008-10-22 23:57:26 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-10-23 00:11:07 -0400 |
| commit | 057316cc6a5b521b332a1d7ccc871cd60c904c74 (patch) | |
| tree | 4333e608da237c73ff69b10878025cca96dcb4c8 /include/asm-x86/olpc.h | |
| parent | 3e2dab9a1c2deb03c311eb3f83466009147ed4d3 (diff) | |
| parent | 2515ddc6db8eb49a79f0fe5e67ff09ac7c81eab4 (diff) | |
Merge branch 'linus' into test
Conflicts:
MAINTAINERS
arch/x86/kernel/acpi/boot.c
arch/x86/kernel/acpi/sleep.c
drivers/acpi/Kconfig
drivers/pnp/Makefile
drivers/pnp/quirks.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'include/asm-x86/olpc.h')
| -rw-r--r-- | include/asm-x86/olpc.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-x86/olpc.h b/include/asm-x86/olpc.h index 97d47133486f..d7328b1a05c1 100644 --- a/include/asm-x86/olpc.h +++ b/include/asm-x86/olpc.h | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /* OLPC machine specific definitions */ | 1 | /* OLPC machine specific definitions */ |
| 2 | 2 | ||
| 3 | #ifndef ASM_OLPC_H_ | 3 | #ifndef ASM_X86__OLPC_H |
| 4 | #define ASM_OLPC_H_ | 4 | #define ASM_X86__OLPC_H |
| 5 | 5 | ||
| 6 | #include <asm/geode.h> | 6 | #include <asm/geode.h> |
| 7 | 7 | ||
| @@ -129,4 +129,4 @@ extern int olpc_ec_mask_unset(uint8_t bits); | |||
| 129 | #define OLPC_GPIO_LID geode_gpio(26) | 129 | #define OLPC_GPIO_LID geode_gpio(26) |
| 130 | #define OLPC_GPIO_ECSCI geode_gpio(27) | 130 | #define OLPC_GPIO_ECSCI geode_gpio(27) |
| 131 | 131 | ||
| 132 | #endif | 132 | #endif /* ASM_X86__OLPC_H */ |