diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-01-30 19:25:51 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-01-30 19:25:51 -0500 |
| commit | bd45ac0c5daae35e7c71138172e63df5cf644cf6 (patch) | |
| tree | 5eb5a599bf6a9d7a8a34e802db932aa9e9555de4 /arch/x86/boot/voyager.c | |
| parent | 4eece4ccf997c0e6d8fdad3d842e37b16b8d705f (diff) | |
| parent | 5bdeae46be6dfe9efa44a548bd622af325f4bdb4 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'arch/x86/boot/voyager.c')
| -rw-r--r-- | arch/x86/boot/voyager.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/x86/boot/voyager.c b/arch/x86/boot/voyager.c index 61c8fe0453be..6499e3239b41 100644 --- a/arch/x86/boot/voyager.c +++ b/arch/x86/boot/voyager.c | |||
| @@ -16,8 +16,6 @@ | |||
| 16 | 16 | ||
| 17 | #include "boot.h" | 17 | #include "boot.h" |
| 18 | 18 | ||
| 19 | #ifdef CONFIG_X86_VOYAGER | ||
| 20 | |||
| 21 | int query_voyager(void) | 19 | int query_voyager(void) |
| 22 | { | 20 | { |
| 23 | u8 err; | 21 | u8 err; |
| @@ -42,5 +40,3 @@ int query_voyager(void) | |||
| 42 | copy_from_fs(data_ptr, di, 7); /* Table is 7 bytes apparently */ | 40 | copy_from_fs(data_ptr, di, 7); /* Table is 7 bytes apparently */ |
| 43 | return 0; | 41 | return 0; |
| 44 | } | 42 | } |
| 45 | |||
| 46 | #endif /* CONFIG_X86_VOYAGER */ | ||