]>
Commit | Line | Data |
---|---|---|
47ab3315 KK |
1 | --- /src/ethernet.c Wed Aug 16 09:56:50 2000 |
2 | +++ /src/ethernet.c.ppc Thu Jan 25 15:16:28 2001 | |
3 | @@ -178,7 +178,7 @@ | |
4 | result->next = (struct ethernet_info *)NULL; | |
5 | ||
6 | result->vendor = "Apple"; | |
7 | - result->id = 0; | |
8 | + result->board_id = 0; | |
9 | result->bus = UNKNOWN_BUS; | |
10 | ||
11 | file = my_malloc(sizeof(folder) * strlen(folder) + 15); | |
12 | ||
13 | --- /src/scsi.c Wed Aug 16 09:56:50 2000 | |
14 | +++ /src/scsi.c.ppc Thu Jan 25 15:16:50 2001 | |
15 | @@ -171,7 +171,7 @@ | |
16 | result->next = (struct scsintf_info *)NULL; | |
17 | ||
18 | result->vendor = "Apple"; | |
19 | - result->id = 0; | |
20 | + result->board_id = 0; | |
21 | result->bus = UNKNOWN_BUS; | |
22 | ||
23 | file = my_malloc(sizeof(folder) * strlen(folder) + 15); | |
24 | ||
25 | --- /src/SuperProbe/AsmMacros.h Fri Jul 28 05:20:15 2000 | |
26 | +++ /src/SuperProbe/AsmMacros.h.ppc Thu Jan 25 16:10:28 2001 | |
27 | @@ -60,7 +60,7 @@ | |
28 | /* $XFree86: xc/programs/Xserver/hw/xfree86/SuperProbe/AsmMacros.h,v 3.10.2.1 1999/06/17 16:23:57 hohndel Exp $ */ | |
29 | ||
30 | #if defined(__GNUC__) | |
31 | -#if defined(linux) && defined(__alpha__) | |
32 | +#if defined(linux) && (defined(__alpha__) || defined(__powerpc__)) | |
33 | #define inb _inb | |
34 | #define inw _inw | |
35 | #define inl _inl |