diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-08 12:04:48 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-08 12:04:52 -0400 |
| commit | 280ff388b1b7a818a64af4c789299e62c0d3c094 (patch) | |
| tree | d63877375029eb895131a37d2eeeac306cc6c7f0 /arch/powerpc/include/asm/rtas.h | |
| parent | c5da9a2bb24a7928c39495cdabf98d3f7931bde5 (diff) | |
| parent | 577c9c456f0e1371cbade38eaf91ae8e8a308555 (diff) | |
Merge commit 'v2.6.30-rc1' into x86/urgent
Merge reason: fix to be queued up depends on upstream facilities
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/powerpc/include/asm/rtas.h')
| -rw-r--r-- | arch/powerpc/include/asm/rtas.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/rtas.h b/arch/powerpc/include/asm/rtas.h index 0aa0315fb7e8..01c12339b304 100644 --- a/arch/powerpc/include/asm/rtas.h +++ b/arch/powerpc/include/asm/rtas.h | |||
| @@ -68,7 +68,8 @@ struct rtas_t { | |||
| 68 | #define RTAS_EPOW_WARNING 0x40000000 /* set bit 1 */ | 68 | #define RTAS_EPOW_WARNING 0x40000000 /* set bit 1 */ |
| 69 | #define RTAS_POWERMGM_EVENTS 0x20000000 /* set bit 2 */ | 69 | #define RTAS_POWERMGM_EVENTS 0x20000000 /* set bit 2 */ |
| 70 | #define RTAS_HOTPLUG_EVENTS 0x10000000 /* set bit 3 */ | 70 | #define RTAS_HOTPLUG_EVENTS 0x10000000 /* set bit 3 */ |
| 71 | #define RTAS_EVENT_SCAN_ALL_EVENTS 0xf0000000 | 71 | #define RTAS_IO_EVENTS 0x08000000 /* set bit 4 */ |
| 72 | #define RTAS_EVENT_SCAN_ALL_EVENTS 0xffffffff | ||
| 72 | 73 | ||
| 73 | /* RTAS event severity */ | 74 | /* RTAS event severity */ |
| 74 | #define RTAS_SEVERITY_FATAL 0x5 | 75 | #define RTAS_SEVERITY_FATAL 0x5 |