diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-03-23 17:13:43 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-23 17:13:43 -0500 |
| commit | 88e3c1da8b3258a81c5c81d4e7e22557b7d71ba7 (patch) | |
| tree | ab518773c0ff4606f1a57d00b5931332a7e1d96e /include/asm-powerpc/processor.h | |
| parent | fa4fa40a990f8f4eff65476bef32007c154bbac0 (diff) | |
| parent | b0e6e962992b76580f4900b166a337bad7c1e81b (diff) | |
Merge branch 'master'
Diffstat (limited to 'include/asm-powerpc/processor.h')
| -rw-r--r-- | include/asm-powerpc/processor.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-powerpc/processor.h b/include/asm-powerpc/processor.h index 415fa393b00c..1c64a211cf19 100644 --- a/include/asm-powerpc/processor.h +++ b/include/asm-powerpc/processor.h | |||
| @@ -52,7 +52,6 @@ | |||
| 52 | #ifdef __KERNEL__ | 52 | #ifdef __KERNEL__ |
| 53 | #define platform_is_pseries() (_machine == PLATFORM_PSERIES || \ | 53 | #define platform_is_pseries() (_machine == PLATFORM_PSERIES || \ |
| 54 | _machine == PLATFORM_PSERIES_LPAR) | 54 | _machine == PLATFORM_PSERIES_LPAR) |
| 55 | #define platform_is_lpar() (!!(_machine & PLATFORM_LPAR)) | ||
| 56 | 55 | ||
| 57 | #if defined(CONFIG_PPC_MULTIPLATFORM) | 56 | #if defined(CONFIG_PPC_MULTIPLATFORM) |
| 58 | extern int _machine; | 57 | extern int _machine; |