]>
Commit | Line | Data |
---|---|---|
30626c23 | 1 | diff -Nur linux.old/arch/sparc64/kernel/sparc64_ksyms.c linux/arch/sparc64/kernel/sparc64_ksyms.c |
2 | --- linux.old/arch/sparc64/kernel/sparc64_ksyms.c Fri Dec 21 18:41:53 2001 | |
3 | +++ linux/arch/sparc64/kernel/sparc64_ksyms.c Mon Jan 28 10:28:22 2002 | |
4 | @@ -305,12 +305,9 @@ | |
5 | EXPORT_SYMBOL(sunos_sys_table); | |
6 | EXPORT_SYMBOL(sys_call_table32); | |
7 | EXPORT_SYMBOL(tl0_solaris); | |
8 | -EXPORT_SYMBOL(sys_sigsuspend); | |
9 | -EXPORT_SYMBOL(sys_getppid); | |
10 | EXPORT_SYMBOL(svr4_getcontext); | |
11 | EXPORT_SYMBOL(svr4_setcontext); | |
12 | EXPORT_SYMBOL(prom_cpu_nodes); | |
13 | -EXPORT_SYMBOL(sys_ioctl); | |
14 | EXPORT_SYMBOL(sys32_ioctl); | |
15 | EXPORT_SYMBOL(sparc32_open); | |
16 | #endif | |
17 | diff -Nur linux.old/kernel/syscall_ksyms.c linux/kernel/syscall_ksyms.c | |
18 | --- linux.old/kernel/syscall_ksyms.c Tue Jan 29 12:49:03 2002 | |
19 | +++ linux/kernel/syscall_ksyms.c Tue Jan 29 12:41:18 2002 | |
20 | @@ -49,9 +49,11 @@ | |
21 | EXPORT_SYMBOL(sys_statfs); | |
22 | EXPORT_SYMBOL(sys_fstatfs); | |
23 | EXPORT_SYMBOL(sys_ftruncate); | |
24 | -EXPORT_SYMBOL(sys_ftruncate64); | |
25 | EXPORT_SYMBOL(sys_truncate); | |
26 | +#if defined(__sparc__) && !defined(__arch64__) | |
27 | +EXPORT_SYMBOL(sys_ftruncate64); | |
28 | EXPORT_SYMBOL(sys_truncate64); | |
29 | +#endif | |
30 | #if !defined(__alpha__) && !defined(__ia64__) | |
31 | EXPORT_SYMBOL(sys_utime); | |
32 | #endif | |
33 | @@ -177,3 +179,4 @@ | |
34 | EXPORT_SYMBOL(sys_shmat); | |
35 | EXPORT_SYMBOL(sys_shmdt); | |
36 | EXPORT_SYMBOL(sys_shmctl); | |
37 | + | |
d189f973 | 38 | diff -Nur linux/include/asm-sparc64/dma.h.org linux/include/asm-sparc64/dma.h |
0024ece0 | 39 | --- linux/include/asm-sparc64/dma.h.org Fri Feb 8 14:56:56 2002 |
40 | +++ linux/include/asm-sparc64/dma.h Sun Feb 10 11:07:51 2002 | |
d189f973 | 41 | @@ -224,4 +224,6 @@ |
42 | */ | |
43 | #define DMA_CHUNK_SIZE 8192 | |
44 | ||
45 | +#define DMA_AUTOINIT 0x10 | |
46 | + | |
47 | #endif /* !(_ASM_SPARC64_DMA_H) */ | |
48 | diff -Nur linux/drivers/usb/serial/ir-usb.c.org linux/drivers/usb/serial/ir-usb.c | |
0024ece0 | 49 | --- linux/drivers/usb/serial/ir-usb.c.org Sun Feb 10 10:21:23 2002 |
50 | +++ linux/drivers/usb/serial/ir-usb.c Sun Feb 10 10:25:33 2002 | |
d189f973 | 51 | @@ -435,7 +435,7 @@ |
52 | case B115200: baud = SPEED_115200; break; | |
53 | case B576000: baud = SPEED_576000; break; | |
54 | case B1152000: baud = SPEED_1152000; break; | |
55 | - case B4000000: baud = SPEED_4000000; break; | |
56 | +/* case B4000000: baud = SPEED_4000000; break; */ | |
57 | default: | |
58 | err ("ir-usb driver does not support the baudrate (%d) requested", tty_get_baud_rate(port->tty)); | |
59 | return; | |
54737dc9 | 60 | --- linux/include/asm-sparc64/ide.h.org Sun Feb 10 12:42:17 2002 |
61 | +++ linux/include/asm-sparc64/ide.h Sun Feb 10 12:41:50 2002 | |
62 | @@ -87,7 +87,7 @@ | |
63 | unsigned int reserved456: 3; | |
64 | unsigned bit3 : 1; /* ATA-2 thingy */ | |
65 | unsigned int SRST : 1; /* host soft reset bit */ | |
66 | - unsigned int nIEN : 1; /* device INTRQ to host * | |
67 | + unsigned int nIEN : 1; /* device INTRQ to host */ | |
68 | unsigned int bit0 : 1; | |
69 | } b; | |
70 | } control_t; |