summaryrefslogtreecommitdiff
path: root/debian/patches/90_autoconf_autogen.patch
blob: 9b41eac5eab976a8f1043075f6e3ae971f786ca6 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
This patch is just autogenerated stuff, do not hack directly on it.
Regenerate with:

       autoreconf -fis
       find -name autom4te.cache | xargs rm -rf


--- aclocal.m4	2006-11-14 03:58:55.000000000 +0200
+++ aclocal.m4	2006-11-14 04:25:54.000000000 +0200
@@ -11,8 +11,8 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-m4_if(m4_PACKAGE_VERSION, [2.60],,
-[m4_fatal([this file was generated for autoconf 2.60.
+m4_if(m4_PACKAGE_VERSION, [2.60a],,
+[m4_fatal([this file was generated for autoconf 2.60a.
 You have another version of autoconf.  If you want to use that,
 you should regenerate the build system entirely.], [63])])
 
--- build-aux/config.guess	2006-11-14 03:58:56.000000000 +0200
+++ build-aux/config.guess	2006-11-14 04:26:12.000000000 +0200
@@ -1,9 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+#   Inc.
 
-timestamp='2006-02-23'
+timestamp='2006-07-02'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -210,7 +211,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
 	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
 	exit ;;
     macppc:MirBSD:*:*)
-	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
+	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
 	exit ;;
     *:MirBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
@@ -770,6 +771,8 @@ EOF
 	case ${UNAME_MACHINE} in
 	    pc98)
 		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	    amd64)
+		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	    *)
 		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	esac
@@ -780,9 +783,6 @@ EOF
     i*:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
-    i*:MSYS_NT-*:*:*)
-	echo ${UNAME_MACHINE}-pc-mingw32
-	exit ;;
     i*:windows32*:*)
     	# uname -m includes "-pc" on this system.
     	echo ${UNAME_MACHINE}-mingw32
@@ -790,10 +790,10 @@ EOF
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
-    x86:Interix*:[345]*)
+    x86:Interix*:[3456]*)
 	echo i586-pc-interix${UNAME_RELEASE}
 	exit ;;
-    EM64T:Interix*:[345]*)
+    EM64T:Interix*:[3456]*)
 	echo x86_64-unknown-interix${UNAME_RELEASE}
 	exit ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
@@ -831,6 +831,9 @@ EOF
     arm*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
+    avr32*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
     cris:Linux:*:*)
 	echo cris-axis-linux-gnu
 	exit ;;
@@ -989,7 +992,7 @@ EOF
 	LIBC=gnulibc1
 	# endif
 	#else
-	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__sun)
+	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
 	LIBC=gnu
 	#else
 	LIBC=gnuaout
--- build-aux/config.sub	2006-11-14 03:58:56.000000000 +0200
+++ build-aux/config.sub	2006-11-14 04:26:12.000000000 +0200
@@ -1,9 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+#   Inc.
 
-timestamp='2006-02-23'
+timestamp='2006-09-20'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -240,7 +241,7 @@ case $basic_machine in
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
 	| bfin \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
@@ -248,7 +249,8 @@ case $basic_machine in
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
-	| m32r | m32rle | m68000 | m68k | m88k | maxq | mb | microblaze | mcore \
+	| m32c | m32r | m32rle | m68000 | m68k | m88k \
+	| maxq | mb | microblaze | mcore \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@@ -274,21 +276,19 @@ case $basic_machine in
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
-	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+	| score \
+	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
-	| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
-	| sparcv8 | sparcv9 | sparcv9b \
-	| strongarm \
+	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+	| spu | strongarm \
 	| tahoe | thumb | tic4x | tic80 | tron \
 	| v850 | v850e \
 	| we32k \
-	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
+	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
 	| z8k)
 		basic_machine=$basic_machine-unknown
 		;;
-	m32c)
-		basic_machine=$basic_machine-unknown
-		;;
 	m6811 | m68hc11 | m6812 | m68hc12)
 		# Motorola 68HC11/12.
 		basic_machine=$basic_machine-unknown
@@ -318,7 +318,7 @@ case $basic_machine in
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* \
+	| avr-* | avr32-* \
 	| bfin-* | bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
 	| clipper-* | craynv-* | cydra-* \
@@ -329,7 +329,7 @@ case $basic_machine in
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
-	| m32r-* | m32rle-* \
+	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
 	| m88110-* | m88k-* | maxq-* | mcore-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
@@ -358,23 +358,21 @@ case $basic_machine in
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
 	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
+	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
 	| tahoe-* | thumb-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
 	| tron-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
+	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
 	| xstormy16-* | xtensa-* \
 	| ymp-* \
 	| z8k-*)
 		;;
-	m32c-*)
-		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
 	386bsd)
@@ -912,6 +910,10 @@ case $basic_machine in
 	sb1el)
 		basic_machine=mipsisa64sb1el-unknown
 		;;
+	sde)
+		basic_machine=mipsisa32-sde
+		os=-elf
+		;;
 	sei)
 		basic_machine=mips-sei
 		os=-seiux
@@ -1128,7 +1130,7 @@ case $basic_machine in
 	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
 		basic_machine=sh-unknown
 		;;
-	sparc | sparcv8 | sparcv9 | sparcv9b)
+	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
 		basic_machine=sparc-sun
 		;;
 	cydra)
@@ -1217,7 +1219,7 @@ case $os in
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos*)
+	      | -skyos* | -haiku* | -rdos* | -toppers*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1369,6 +1371,12 @@ else
 # system, and we'll never get to this point.
 
 case $basic_machine in
+        score-*)
+		os=-elf
+		;;
+        spu-*)
+		os=-elf
+		;;
 	*-acorn)
 		os=-riscix1.2
 		;;
@@ -1378,9 +1386,9 @@ case $basic_machine in
 	arm*-semi)
 		os=-aout
 		;;
-    c4x-* | tic4x-*)
-        os=-coff
-        ;;
+        c4x-* | tic4x-*)
+        	os=-coff
+		;;
 	# This must come before the *-dec entry.
 	pdp10-*)
 		os=-tops20
--- config.h.in	2006-11-14 03:58:55.000000000 +0200
+++ config.h.in	2006-11-14 04:26:07.000000000 +0200
@@ -43,6 +43,9 @@
 /* option floppy: Linux device driver for PC floppy */
 #undef CONFIG_BLK_DEV_FD
 
+/* Force DMA on IDE block devices */
+#undef CONFIG_BLK_DEV_FORCE_DMA
+
 /* option ide: Linux device driver for IDE disk controllers */
 #undef CONFIG_BLK_DEV_IDE
 
@@ -319,6 +322,9 @@
 /* option seeq8005: Linux device driver for Ethernet controller Seeq8005 */
 #undef CONFIG_SEEQ8005
 
+/* option sis900: Linux device driver for Ethernet controller SiS 900 */
+#undef CONFIG_SIS900
+
 /* option sk_g16: Linux device driver for Ethernet controller Schneider & Koch
    G16 */
 #undef CONFIG_SK_G16
--- configure	2006-11-14 03:58:56.000000000 +0200
+++ configure	2006-11-14 04:26:03.000000000 +0200
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60 for GNU Mach 1.3.99.
+# Generated by GNU Autoconf 2.60a for GNU Mach 1.3.99.
 #
 # Report bugs to <bug-hurd@gnu.org>.
 #
@@ -808,6 +808,8 @@ device_driver_rtl8139_TRUE
 device_driver_rtl8139_FALSE
 device_driver_seeq8005_TRUE
 device_driver_seeq8005_FALSE
+device_driver_sis900_TRUE
+device_driver_sis900_FALSE
 device_driver_sk_g16_TRUE
 device_driver_sk_g16_FALSE
 device_driver_smc_ultra_TRUE
@@ -1466,6 +1468,7 @@ Optional Features:
   --disable-lpr           disable use of lpr device
   --disable-floppy        disable Linux device driver for PC floppy
   --disable-ide           disable Linux device driver for IDE disk controllers
+  --enable-ide-forcedma   enable forced use of DMA on IDE
   --disable-53c78xx       disable Linux device driver for SCSI controller NCR
                           53C7,8xx
   --disable-AM53C974      disable Linux device driver for SCSI controller
@@ -1608,6 +1611,8 @@ Optional Features:
                           8019/8029!)
   --disable-seeq8005      disable Linux device driver for Ethernet controller
                           Seeq8005
+  --disable-sis900        disable Linux device driver for Ethernet controller
+                          SiS 900
   --disable-sk_g16        disable Linux device driver for Ethernet controller
                           Schneider & Koch G16
   --disable-smc-ultra     disable Linux device driver for Ethernet controller
@@ -1732,7 +1737,7 @@ test -n "$ac_init_help" && exit $ac_stat
 if $ac_init_version; then
   cat <<\_ACEOF
 GNU Mach configure 1.3.99
-generated by GNU Autoconf 2.60
+generated by GNU Autoconf 2.60a
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -1746,7 +1751,7 @@ This file contains any messages produced
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by GNU Mach $as_me 1.3.99, which was
-generated by GNU Autoconf 2.60.  Invocation command line was
+generated by GNU Autoconf 2.60a.  Invocation command line was
 
   $ $0 $@
 
@@ -3209,7 +3214,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
 # in a Makefile.  We should not override ac_cv_exeext if it was cached,
 # so that the user can short-circuit this test for compilers unknown to
 # Autoconf.
-for ac_file in $ac_files
+for ac_file in $ac_files ''
 do
   test -f "$ac_file" || continue
   case $ac_file in
@@ -3237,6 +3242,12 @@ done
 test "$ac_cv_exeext" = no && ac_cv_exeext=
 
 else
+  ac_file=''
+fi
+
+{ echo "$as_me:$LINENO: result: $ac_file" >&5
+echo "${ECHO_T}$ac_file" >&6; }
+if test -z "$ac_file"; then
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
@@ -3248,8 +3259,6 @@ See \`config.log' for more details." >&2
 fi
 
 ac_exeext=$ac_cv_exeext
-{ echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6; }
 
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
@@ -6694,6 +6703,17 @@ _ACEOF
 fi
 
 
+# Check whether --enable-ide-forcedma was given.
+if test "${enable_ide_forcedma+set}" = set; then
+  enableval=$enable_ide_forcedma; test x"$enableval" = xno ||
+
+cat >>confdefs.h <<\_ACEOF
+#define CONFIG_BLK_DEV_FORCE_DMA 1
+_ACEOF
+
+fi
+
+
 
 
 
@@ -8453,6 +8473,32 @@ fi
 
 
 unset enableval
+# Check whether --enable-sis900 was given.
+if test "${enable_sis900+set}" = set; then
+  enableval=$enable_sis900;
+fi
+
+enableval=${enableval-$enable_default_device_drivers}
+ if test x"$enableval" = xyes; then
+  device_driver_sis900_TRUE=
+  device_driver_sis900_FALSE='#'
+else
+  device_driver_sis900_TRUE='#'
+  device_driver_sis900_FALSE=
+fi
+
+if test x"$enableval" = xyes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define CONFIG_SIS900 1
+_ACEOF
+
+  device_driver_group net
+fi
+
+
+
+unset enableval
 # Check whether --enable-sk_g16 was given.
 if test "${enable_sk_g16+set}" = set; then
   enableval=$enable_sk_g16;
@@ -9929,6 +9975,13 @@ echo "$as_me: error: conditional \"devic
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
+if test -z "${device_driver_sis900_TRUE}" && test -z "${device_driver_sis900_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"device_driver_sis900\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"device_driver_sis900\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 if test -z "${device_driver_sk_g16_TRUE}" && test -z "${device_driver_sk_g16_FALSE}"; then
   { { echo "$as_me:$LINENO: error: conditional \"device_driver_sk_g16\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -10427,7 +10480,7 @@ exec 6>&1
 # values after options handling.
 ac_log="
 This file was extended by GNU Mach $as_me 1.3.99, which was
-generated by GNU Autoconf 2.60.  Invocation command line was
+generated by GNU Autoconf 2.60a.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -10457,7 +10510,7 @@ current configuration.
 Usage: $0 [OPTIONS] [FILE]...
 
   -h, --help       print this help, then exit
-  -V, --version    print version number, then exit
+  -V, --version    print version number and configuration settings, then exit
   -q, --quiet      do not print progress messages
   -d, --debug      don't remove temporary files
       --recheck    update $as_me by reconfiguring in the same conditions
@@ -10484,7 +10537,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
 GNU Mach config.status 1.3.99
-configured by $0, generated by GNU Autoconf 2.60,
+configured by $0, generated by GNU Autoconf 2.60a,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
 Copyright (C) 2006 Free Software Foundation, Inc.
@@ -11003,6 +11056,8 @@ device_driver_rtl8139_TRUE!$device_drive
 device_driver_rtl8139_FALSE!$device_driver_rtl8139_FALSE$ac_delim
 device_driver_seeq8005_TRUE!$device_driver_seeq8005_TRUE$ac_delim
 device_driver_seeq8005_FALSE!$device_driver_seeq8005_FALSE$ac_delim
+device_driver_sis900_TRUE!$device_driver_sis900_TRUE$ac_delim
+device_driver_sis900_FALSE!$device_driver_sis900_FALSE$ac_delim
 device_driver_sk_g16_TRUE!$device_driver_sk_g16_TRUE$ac_delim
 device_driver_sk_g16_FALSE!$device_driver_sk_g16_FALSE$ac_delim
 device_driver_smc_ultra_TRUE!$device_driver_smc_ultra_TRUE$ac_delim
@@ -11048,8 +11103,6 @@ device_driver_pcnet_cs_FALSE!$device_dri
 device_driver_smc91c92_cs_TRUE!$device_driver_smc91c92_cs_TRUE$ac_delim
 device_driver_smc91c92_cs_FALSE!$device_driver_smc91c92_cs_FALSE$ac_delim
 device_driver_xirc2ps_cs_TRUE!$device_driver_xirc2ps_cs_TRUE$ac_delim
-device_driver_xirc2ps_cs_FALSE!$device_driver_xirc2ps_cs_FALSE$ac_delim
-device_driver_orinoco_cs_TRUE!$device_driver_orinoco_cs_TRUE$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -11091,6 +11144,8 @@ _ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+device_driver_xirc2ps_cs_FALSE!$device_driver_xirc2ps_cs_FALSE$ac_delim
+device_driver_orinoco_cs_TRUE!$device_driver_orinoco_cs_TRUE$ac_delim
 device_driver_orinoco_cs_FALSE!$device_driver_orinoco_cs_FALSE$ac_delim
 device_driver_group_net_TRUE!$device_driver_group_net_TRUE$ac_delim
 device_driver_group_net_FALSE!$device_driver_group_net_FALSE$ac_delim
@@ -11102,7 +11157,7 @@ LIBOBJS!$LIBOBJS$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 9; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 11; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
--- Makefile.in	2006-11-14 03:58:55.000000000 +0200
+++ Makefile.in	2006-11-14 04:26:15.000000000 +0200
@@ -109,28 +109,6 @@
 # Tests.
 #
 
-# Makefile fragment for the documentation.
-
-# Copyright (C) 2006 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-#
-# The GNU Mach Reference Manual.
-#
-
 # Makefile fragment for Linux device drivers and the glue code.
 
 # Copyright (C) 2006 Free Software Foundation, Inc.
@@ -203,11 +181,9 @@ DIST_COMMON = README $(am__configure_dep
 	$(include_mach_eXec_HEADERS) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/Makefrag.am \
 	$(srcdir)/Makerules.am $(srcdir)/config.h.in \
-	$(srcdir)/doc/Makefrag.am $(srcdir)/doc/stamp-vti \
-	$(srcdir)/doc/version.texi $(srcdir)/i386/Makefrag.am \
-	$(srcdir)/i386/linux/Makefrag.am $(srcdir)/linux/Makefrag.am \
-	$(srcdir)/tests/Makefrag.am $(srcdir)/version.c.in \
-	$(top_srcdir)/${systype}/${systype} \
+	$(srcdir)/i386/Makefrag.am $(srcdir)/i386/linux/Makefrag.am \
+	$(srcdir)/linux/Makefrag.am $(srcdir)/tests/Makefrag.am \
+	$(srcdir)/version.c.in $(top_srcdir)/${systype}/${systype} \
 	$(top_srcdir)/${systype}/include/mach/${systype} \
 	$(top_srcdir)/configure \
 	$(top_srcdir)/linux/dev/include/asm-${systype} \
@@ -571,49 +547,52 @@ DIST_COMMON = README $(am__configure_dep
 @device_driver_seeq8005_TRUE@am__append_80 = \
 @device_driver_seeq8005_TRUE@	linux/src/drivers/net/seeq8005.c
 
-@device_driver_sk_g16_TRUE@am__append_81 = \
+@device_driver_sis900_TRUE@am__append_81 = \
+@device_driver_sis900_TRUE@	linux/src/drivers/net/sis900.c
+
+@device_driver_sk_g16_TRUE@am__append_82 = \
 @device_driver_sk_g16_TRUE@	linux/src/drivers/net/sk_g16.c
 
-@device_driver_smc_ultra_TRUE@am__append_82 = \
+@device_driver_smc_ultra_TRUE@am__append_83 = \
 @device_driver_smc_ultra_TRUE@	linux/src/drivers/net/smc-ultra.c \
 @device_driver_smc_ultra_TRUE@	linux/src/drivers/net/8390.c
 
-@device_driver_smc_ultra32_TRUE@am__append_83 = \
+@device_driver_smc_ultra32_TRUE@am__append_84 = \
 @device_driver_smc_ultra32_TRUE@	linux/src/drivers/net/smc-ultra32.c \
 @device_driver_smc_ultra32_TRUE@	linux/src/drivers/net/8390.c
 
-@device_driver_starfire_TRUE@am__append_84 = \
+@device_driver_starfire_TRUE@am__append_85 = \
 @device_driver_starfire_TRUE@	linux/src/drivers/net/starfire.c
 
-@device_driver_sundance_TRUE@am__append_85 = \
+@device_driver_sundance_TRUE@am__append_86 = \
 @device_driver_sundance_TRUE@	linux/src/drivers/net/sundance.c
 
-@device_driver_tlan_TRUE@am__append_86 = \
+@device_driver_tlan_TRUE@am__append_87 = \
 @device_driver_tlan_TRUE@	linux/src/drivers/net/tlan.c
 
-@device_driver_tulip_TRUE@am__append_87 = \
+@device_driver_tulip_TRUE@am__append_88 = \
 @device_driver_tulip_TRUE@	linux/src/drivers/net/tulip.c
 
-@device_driver_via_rhine_TRUE@am__append_88 = \
+@device_driver_via_rhine_TRUE@am__append_89 = \
 @device_driver_via_rhine_TRUE@	linux/src/drivers/net/via-rhine.c
 
-@device_driver_wavelan_TRUE@am__append_89 = \
+@device_driver_wavelan_TRUE@am__append_90 = \
 @device_driver_wavelan_TRUE@	linux/src/drivers/net/wavelan.c
 
-@device_driver_wd_TRUE@am__append_90 = \
+@device_driver_wd_TRUE@am__append_91 = \
 @device_driver_wd_TRUE@	linux/src/drivers/net/wd.c
 
-@device_driver_winbond_840_TRUE@am__append_91 = \
+@device_driver_winbond_840_TRUE@am__append_92 = \
 @device_driver_winbond_840_TRUE@	linux/src/drivers/net/winbond-840.c \
 @device_driver_winbond_840_TRUE@	linux/src/drivers/net/8390.c
 
-@device_driver_yellowfin_TRUE@am__append_92 = \
+@device_driver_yellowfin_TRUE@am__append_93 = \
 @device_driver_yellowfin_TRUE@	linux/src/drivers/net/yellowfin.c
 
-@device_driver_znet_TRUE@am__append_93 = \
+@device_driver_znet_TRUE@am__append_94 = \
 @device_driver_znet_TRUE@	linux/src/drivers/net/znet.c
 
-@device_driver_group_pcmcia_TRUE@am__append_94 = \
+@device_driver_group_pcmcia_TRUE@am__append_95 = \
 @device_driver_group_pcmcia_TRUE@	linux/pcmcia-cs/glue/pcmcia.c \
 @device_driver_group_pcmcia_TRUE@	linux/pcmcia-cs/modules/cs.c \
 @device_driver_group_pcmcia_TRUE@	linux/pcmcia-cs/modules/ds.c \
@@ -622,40 +601,40 @@ DIST_COMMON = README $(am__configure_dep
 @device_driver_group_pcmcia_TRUE@	linux/pcmcia-cs/modules/cistpl.c \
 @device_driver_group_pcmcia_TRUE@	linux/pcmcia-cs/modules/pci_fixup.c
 
-@device_driver_i82365_TRUE@am__append_95 = \
+@device_driver_i82365_TRUE@am__append_96 = \
 @device_driver_i82365_TRUE@	linux/pcmcia-cs/modules/i82365.c
 
-@device_driver_3c574_cs_TRUE@am__append_96 = \
+@device_driver_3c574_cs_TRUE@am__append_97 = \
 @device_driver_3c574_cs_TRUE@	linux/pcmcia-cs/clients/3c574_cs.c
 
-@device_driver_3c589_cs_TRUE@am__append_97 = \
+@device_driver_3c589_cs_TRUE@am__append_98 = \
 @device_driver_3c589_cs_TRUE@	linux/pcmcia-cs/clients/3c589_cs.c
 
-@device_driver_axnet_cs_TRUE@am__append_98 = \
+@device_driver_axnet_cs_TRUE@am__append_99 = \
 @device_driver_axnet_cs_TRUE@	linux/pcmcia-cs/clients/axnet_cs.c
 
-@device_driver_fmvj18x_cs_TRUE@am__append_99 = \
+@device_driver_fmvj18x_cs_TRUE@am__append_100 = \
 @device_driver_fmvj18x_cs_TRUE@	linux/pcmcia-cs/clients/fmvj18x_cs.c
 
-@device_driver_nmclan_cs_TRUE@am__append_100 = \
+@device_driver_nmclan_cs_TRUE@am__append_101 = \
 @device_driver_nmclan_cs_TRUE@	linux/pcmcia-cs/clients/nmclan_cs.c
 
-@device_driver_pcnet_cs_TRUE@am__append_101 = \
+@device_driver_pcnet_cs_TRUE@am__append_102 = \
 @device_driver_pcnet_cs_TRUE@	linux/pcmcia-cs/clients/pcnet_cs.c \
 @device_driver_pcnet_cs_TRUE@	linux/src/drivers/net/8390.c
 
-@device_driver_smc91c92_cs_TRUE@am__append_102 = \
+@device_driver_smc91c92_cs_TRUE@am__append_103 = \
 @device_driver_smc91c92_cs_TRUE@	linux/pcmcia-cs/clients/smc91c92_cs.c
 
-@device_driver_xirc2ps_cs_TRUE@am__append_103 = \
+@device_driver_xirc2ps_cs_TRUE@am__append_104 = \
 @device_driver_xirc2ps_cs_TRUE@	linux/pcmcia-cs/clients/xirc2ps_cs.c
 
-@device_driver_orinoco_cs_TRUE@am__append_104 = \
+@device_driver_orinoco_cs_TRUE@am__append_105 = \
 @device_driver_orinoco_cs_TRUE@	linux/pcmcia-cs/wireless/hermes.c \
 @device_driver_orinoco_cs_TRUE@	linux/pcmcia-cs/wireless/orinoco.c \
 @device_driver_orinoco_cs_TRUE@	linux/pcmcia-cs/wireless/orinoco_cs.c
 
-@HOST_i386_TRUE@am__append_105 = \
+@HOST_i386_TRUE@am__append_106 = \
 @HOST_i386_TRUE@	linux/src/arch/i386/lib/semaphore.S
 
 exec_boot_PROGRAMS = gnumach$(EXEEXT)
@@ -721,31 +700,32 @@ am__libkernel_a_SOURCES_DIST = ddb/db_ac
 	kern/boot_script.c util/putchar.c util/puts.c vm/vm_debug.c \
 	vm/vm_external.c vm/vm_fault.c vm/vm_init.c vm/vm_kern.c \
 	vm/vm_map.c vm/vm_object.c vm/vm_pageout.c vm/vm_resident.c \
-	vm/vm_user.c vm/memory_object.c device/cons.c \
-	device/dev_lookup.c device/dev_name.c device/dev_pager.c \
-	device/device_init.c device/ds_routines.c device/subrs.c \
-	device/net_io.c device/blkio.c device/chario.c device/kmsg.c \
-	version.c i386/i386at/autoconf.c i386/i386at/boothdr.S \
-	i386/i386at/com.c i386/i386at/conf.c i386/i386at/cons_conf.c \
-	i386/i386at/rtc.c i386/i386at/i386at_ds_routines.c \
-	i386/i386at/immc.c i386/i386at/int_init.c \
-	i386/i386at/interrupt.S i386/i386at/iopl.c i386/i386at/kd.c \
-	i386/i386at/kdasm.S i386/i386at/kd_event.c \
-	i386/i386at/kd_mouse.c i386/i386at/kd_queue.c \
-	i386/i386at/model_dep.c i386/i386at/pic_isa.c \
-	i386/i386at/lpr.c i386/i386/ast_check.c i386/i386/cswitch.S \
-	i386/i386/db_disasm.c i386/i386/db_interface.c \
-	i386/i386/db_trace.c i386/i386/debug_i386.c \
-	i386/i386/debug_trace.S i386/i386/fpe_linkage.c \
-	i386/i386/fpu.c i386/i386/gdt.c i386/i386/hardclock.c \
-	i386/i386/idt.c i386/i386/idt_inittab.S i386/i386/io_emulate.c \
-	i386/i386/io_map.c i386/i386/iopb.c i386/i386/ktss.c \
-	i386/i386/kttd_interface.c i386/i386/ldt.c i386/i386/locore.S \
-	i386/i386/loose_ends.c i386/i386/mp_desc.c i386/i386/pcb.c \
-	i386/i386/phys.c i386/i386/pic.c i386/i386/pit.c \
-	i386/i386/seg.c i386/i386/spl.S i386/i386/trap.c \
-	i386/i386/user_ldt.c i386/i386/_setjmp.S i386/intel/pmap.c \
-	i386/intel/read_fault.c chips/busses.c device/cirbuf.c
+	vm/vm_user.c vm/memory_object_proxy.c vm/memory_object.c \
+	device/cons.c device/dev_lookup.c device/dev_name.c \
+	device/dev_pager.c device/device_init.c device/ds_routines.c \
+	device/subrs.c device/net_io.c device/blkio.c device/chario.c \
+	device/kmsg.c version.c i386/i386at/autoconf.c \
+	i386/i386at/boothdr.S i386/i386at/com.c i386/i386at/conf.c \
+	i386/i386at/cons_conf.c i386/i386at/rtc.c \
+	i386/i386at/i386at_ds_routines.c i386/i386at/immc.c \
+	i386/i386at/int_init.c i386/i386at/interrupt.S \
+	i386/i386at/iopl.c i386/i386at/kd.c i386/i386at/kdasm.S \
+	i386/i386at/kd_event.c i386/i386at/kd_mouse.c \
+	i386/i386at/kd_queue.c i386/i386at/model_dep.c \
+	i386/i386at/pic_isa.c i386/i386at/lpr.c i386/i386/ast_check.c \
+	i386/i386/cswitch.S i386/i386/db_disasm.c \
+	i386/i386/db_interface.c i386/i386/db_trace.c \
+	i386/i386/debug_i386.c i386/i386/debug_trace.S \
+	i386/i386/fpe_linkage.c i386/i386/fpu.c i386/i386/gdt.c \
+	i386/i386/hardclock.c i386/i386/idt.c i386/i386/idt_inittab.S \
+	i386/i386/io_emulate.c i386/i386/io_map.c i386/i386/iopb.c \
+	i386/i386/ktss.c i386/i386/kttd_interface.c i386/i386/ldt.c \
+	i386/i386/locore.S i386/i386/loose_ends.c i386/i386/mp_desc.c \
+	i386/i386/pcb.c i386/i386/phys.c i386/i386/pic.c \
+	i386/i386/pit.c i386/i386/seg.c i386/i386/spl.S \
+	i386/i386/trap.c i386/i386/user_ldt.c i386/i386/_setjmp.S \
+	i386/intel/pmap.c i386/intel/read_fault.c chips/busses.c \
+	device/cirbuf.c
 @enable_kdb_TRUE@am__objects_2 = ddb/db_access.$(OBJEXT) \
 @enable_kdb_TRUE@	ddb/db_aout.$(OBJEXT) ddb/db_break.$(OBJEXT) \
 @enable_kdb_TRUE@	ddb/db_command.$(OBJEXT) \
@@ -855,14 +835,15 @@ am_libkernel_a_OBJECTS = $(am__objects_2
 	vm/vm_kern.$(OBJEXT) vm/vm_map.$(OBJEXT) \
 	vm/vm_object.$(OBJEXT) vm/vm_pageout.$(OBJEXT) \
 	vm/vm_resident.$(OBJEXT) vm/vm_user.$(OBJEXT) \
-	vm/memory_object.$(OBJEXT) device/cons.$(OBJEXT) \
-	device/dev_lookup.$(OBJEXT) device/dev_name.$(OBJEXT) \
-	device/dev_pager.$(OBJEXT) device/device_init.$(OBJEXT) \
-	device/ds_routines.$(OBJEXT) device/subrs.$(OBJEXT) \
-	device/net_io.$(OBJEXT) device/blkio.$(OBJEXT) \
-	device/chario.$(OBJEXT) $(am__objects_3) version.$(OBJEXT) \
-	$(am__objects_4) $(am__objects_5) $(am__objects_6) \
-	$(am__objects_7) $(am__objects_8)
+	vm/memory_object_proxy.$(OBJEXT) vm/memory_object.$(OBJEXT) \
+	device/cons.$(OBJEXT) device/dev_lookup.$(OBJEXT) \
+	device/dev_name.$(OBJEXT) device/dev_pager.$(OBJEXT) \
+	device/device_init.$(OBJEXT) device/ds_routines.$(OBJEXT) \
+	device/subrs.$(OBJEXT) device/net_io.$(OBJEXT) \
+	device/blkio.$(OBJEXT) device/chario.$(OBJEXT) \
+	$(am__objects_3) version.$(OBJEXT) $(am__objects_4) \
+	$(am__objects_5) $(am__objects_6) $(am__objects_7) \
+	$(am__objects_8)
 @HOST_i386_TRUE@am__objects_9 = i386/i386/mach_i386.server.$(OBJEXT)
 nodist_libkernel_a_OBJECTS = vm/memory_object_user.user.$(OBJEXT) \
 	vm/memory_object_default.user.$(OBJEXT) \
@@ -950,7 +931,7 @@ am__liblinux_a_SOURCES_DIST = linux/dev/
 	linux/src/drivers/net/pcnet32.c \
 	linux/src/drivers/net/rtl8139.c \
 	linux/src/drivers/net/seeq8005.c \
-	linux/src/drivers/net/sk_g16.c \
+	linux/src/drivers/net/sis900.c linux/src/drivers/net/sk_g16.c \
 	linux/src/drivers/net/smc-ultra.c \
 	linux/src/drivers/net/smc-ultra32.c \
 	linux/src/drivers/net/starfire.c \
@@ -1057,23 +1038,24 @@ am__liblinux_a_SOURCES_DIST = linux/dev/
 @device_driver_pcnet32_TRUE@am__objects_78 = linux/src/drivers/net/liblinux_a-pcnet32.$(OBJEXT)
 @device_driver_rtl8139_TRUE@am__objects_79 = linux/src/drivers/net/liblinux_a-rtl8139.$(OBJEXT)
 @device_driver_seeq8005_TRUE@am__objects_80 = linux/src/drivers/net/liblinux_a-seeq8005.$(OBJEXT)
-@device_driver_sk_g16_TRUE@am__objects_81 = linux/src/drivers/net/liblinux_a-sk_g16.$(OBJEXT)
-@device_driver_smc_ultra_TRUE@am__objects_82 = linux/src/drivers/net/liblinux_a-smc-ultra.$(OBJEXT) \
+@device_driver_sis900_TRUE@am__objects_81 = linux/src/drivers/net/liblinux_a-sis900.$(OBJEXT)
+@device_driver_sk_g16_TRUE@am__objects_82 = linux/src/drivers/net/liblinux_a-sk_g16.$(OBJEXT)
+@device_driver_smc_ultra_TRUE@am__objects_83 = linux/src/drivers/net/liblinux_a-smc-ultra.$(OBJEXT) \
 @device_driver_smc_ultra_TRUE@	linux/src/drivers/net/liblinux_a-8390.$(OBJEXT)
-@device_driver_smc_ultra32_TRUE@am__objects_83 = linux/src/drivers/net/liblinux_a-smc-ultra32.$(OBJEXT) \
+@device_driver_smc_ultra32_TRUE@am__objects_84 = linux/src/drivers/net/liblinux_a-smc-ultra32.$(OBJEXT) \
 @device_driver_smc_ultra32_TRUE@	linux/src/drivers/net/liblinux_a-8390.$(OBJEXT)
-@device_driver_starfire_TRUE@am__objects_84 = linux/src/drivers/net/liblinux_a-starfire.$(OBJEXT)
-@device_driver_sundance_TRUE@am__objects_85 = linux/src/drivers/net/liblinux_a-sundance.$(OBJEXT)
-@device_driver_tlan_TRUE@am__objects_86 = linux/src/drivers/net/liblinux_a-tlan.$(OBJEXT)
-@device_driver_tulip_TRUE@am__objects_87 = linux/src/drivers/net/liblinux_a-tulip.$(OBJEXT)
-@device_driver_via_rhine_TRUE@am__objects_88 = linux/src/drivers/net/liblinux_a-via-rhine.$(OBJEXT)
-@device_driver_wavelan_TRUE@am__objects_89 = linux/src/drivers/net/liblinux_a-wavelan.$(OBJEXT)
-@device_driver_wd_TRUE@am__objects_90 = linux/src/drivers/net/liblinux_a-wd.$(OBJEXT)
-@device_driver_winbond_840_TRUE@am__objects_91 = linux/src/drivers/net/liblinux_a-winbond-840.$(OBJEXT) \
+@device_driver_starfire_TRUE@am__objects_85 = linux/src/drivers/net/liblinux_a-starfire.$(OBJEXT)
+@device_driver_sundance_TRUE@am__objects_86 = linux/src/drivers/net/liblinux_a-sundance.$(OBJEXT)
+@device_driver_tlan_TRUE@am__objects_87 = linux/src/drivers/net/liblinux_a-tlan.$(OBJEXT)
+@device_driver_tulip_TRUE@am__objects_88 = linux/src/drivers/net/liblinux_a-tulip.$(OBJEXT)
+@device_driver_via_rhine_TRUE@am__objects_89 = linux/src/drivers/net/liblinux_a-via-rhine.$(OBJEXT)
+@device_driver_wavelan_TRUE@am__objects_90 = linux/src/drivers/net/liblinux_a-wavelan.$(OBJEXT)
+@device_driver_wd_TRUE@am__objects_91 = linux/src/drivers/net/liblinux_a-wd.$(OBJEXT)
+@device_driver_winbond_840_TRUE@am__objects_92 = linux/src/drivers/net/liblinux_a-winbond-840.$(OBJEXT) \
 @device_driver_winbond_840_TRUE@	linux/src/drivers/net/liblinux_a-8390.$(OBJEXT)
-@device_driver_yellowfin_TRUE@am__objects_92 = linux/src/drivers/net/liblinux_a-yellowfin.$(OBJEXT)
-@device_driver_znet_TRUE@am__objects_93 = linux/src/drivers/net/liblinux_a-znet.$(OBJEXT)
-@HOST_i386_TRUE@am__objects_94 = linux/src/arch/i386/lib/liblinux_a-semaphore.$(OBJEXT)
+@device_driver_yellowfin_TRUE@am__objects_93 = linux/src/drivers/net/liblinux_a-yellowfin.$(OBJEXT)
+@device_driver_znet_TRUE@am__objects_94 = linux/src/drivers/net/liblinux_a-znet.$(OBJEXT)
+@HOST_i386_TRUE@am__objects_95 = linux/src/arch/i386/lib/liblinux_a-semaphore.$(OBJEXT)
 am_liblinux_a_OBJECTS = linux/dev/init/liblinux_a-version.$(OBJEXT) \
 	linux/dev/kernel/liblinux_a-softirq.$(OBJEXT) \
 	linux/src/arch/i386/lib/liblinux_a-delay.$(OBJEXT) \
@@ -1120,7 +1102,7 @@ am_liblinux_a_OBJECTS = linux/dev/init/l
 	$(am__objects_85) $(am__objects_86) $(am__objects_87) \
 	$(am__objects_88) $(am__objects_89) $(am__objects_90) \
 	$(am__objects_91) $(am__objects_92) $(am__objects_93) \
-	$(am__objects_94)
+	$(am__objects_94) $(am__objects_95)
 liblinux_a_OBJECTS = $(am_liblinux_a_OBJECTS)
 liblinux_pcmcia_cs_clients_a_AR = $(AR) $(ARFLAGS)
 liblinux_pcmcia_cs_clients_a_LIBADD =
@@ -1134,19 +1116,19 @@ am__liblinux_pcmcia_cs_clients_a_SOURCES
 	linux/src/drivers/net/8390.c \
 	linux/pcmcia-cs/clients/smc91c92_cs.c \
 	linux/pcmcia-cs/clients/xirc2ps_cs.c
-@device_driver_3c574_cs_TRUE@am__objects_95 = linux/pcmcia-cs/clients/liblinux_pcmcia_cs_clients_a-3c574_cs.$(OBJEXT)
-@device_driver_3c589_cs_TRUE@am__objects_96 = linux/pcmcia-cs/clients/liblinux_pcmcia_cs_clients_a-3c589_cs.$(OBJEXT)
-@device_driver_axnet_cs_TRUE@am__objects_97 = linux/pcmcia-cs/clients/liblinux_pcmcia_cs_clients_a-axnet_cs.$(OBJEXT)
-@device_driver_fmvj18x_cs_TRUE@am__objects_98 = linux/pcmcia-cs/clients/liblinux_pcmcia_cs_clients_a-fmvj18x_cs.$(OBJEXT)
-@device_driver_nmclan_cs_TRUE@am__objects_99 = linux/pcmcia-cs/clients/liblinux_pcmcia_cs_clients_a-nmclan_cs.$(OBJEXT)
-@device_driver_pcnet_cs_TRUE@am__objects_100 = linux/pcmcia-cs/clients/liblinux_pcmcia_cs_clients_a-pcnet_cs.$(OBJEXT) \
+@device_driver_3c574_cs_TRUE@am__objects_96 = linux/pcmcia-cs/clients/liblinux_pcmcia_cs_clients_a-3c574_cs.$(OBJEXT)
+@device_driver_3c589_cs_TRUE@am__objects_97 = linux/pcmcia-cs/clients/liblinux_pcmcia_cs_clients_a-3c589_cs.$(OBJEXT)
+@device_driver_axnet_cs_TRUE@am__objects_98 = linux/pcmcia-cs/clients/liblinux_pcmcia_cs_clients_a-axnet_cs.$(OBJEXT)
+@device_driver_fmvj18x_cs_TRUE@am__objects_99 = linux/pcmcia-cs/clients/liblinux_pcmcia_cs_clients_a-fmvj18x_cs.$(OBJEXT)
+@device_driver_nmclan_cs_TRUE@am__objects_100 = linux/pcmcia-cs/clients/liblinux_pcmcia_cs_clients_a-nmclan_cs.$(OBJEXT)
+@device_driver_pcnet_cs_TRUE@am__objects_101 = linux/pcmcia-cs/clients/liblinux_pcmcia_cs_clients_a-pcnet_cs.$(OBJEXT) \
 @device_driver_pcnet_cs_TRUE@	linux/src/drivers/net/liblinux_pcmcia_cs_clients_a-8390.$(OBJEXT)
-@device_driver_smc91c92_cs_TRUE@am__objects_101 = linux/pcmcia-cs/clients/liblinux_pcmcia_cs_clients_a-smc91c92_cs.$(OBJEXT)
-@device_driver_xirc2ps_cs_TRUE@am__objects_102 = linux/pcmcia-cs/clients/liblinux_pcmcia_cs_clients_a-xirc2ps_cs.$(OBJEXT)
-am_liblinux_pcmcia_cs_clients_a_OBJECTS = $(am__objects_95) \
-	$(am__objects_96) $(am__objects_97) $(am__objects_98) \
-	$(am__objects_99) $(am__objects_100) $(am__objects_101) \
-	$(am__objects_102)
+@device_driver_smc91c92_cs_TRUE@am__objects_102 = linux/pcmcia-cs/clients/liblinux_pcmcia_cs_clients_a-smc91c92_cs.$(OBJEXT)
+@device_driver_xirc2ps_cs_TRUE@am__objects_103 = linux/pcmcia-cs/clients/liblinux_pcmcia_cs_clients_a-xirc2ps_cs.$(OBJEXT)
+am_liblinux_pcmcia_cs_clients_a_OBJECTS = $(am__objects_96) \
+	$(am__objects_97) $(am__objects_98) $(am__objects_99) \
+	$(am__objects_100) $(am__objects_101) $(am__objects_102) \
+	$(am__objects_103)
 liblinux_pcmcia_cs_clients_a_OBJECTS =  \
 	$(am_liblinux_pcmcia_cs_clients_a_OBJECTS)
 liblinux_pcmcia_cs_modules_a_AR = $(AR) $(ARFLAGS)
@@ -1159,16 +1141,16 @@ am__liblinux_pcmcia_cs_modules_a_SOURCES
 	linux/pcmcia-cs/modules/cistpl.c \
 	linux/pcmcia-cs/modules/pci_fixup.c \
 	linux/pcmcia-cs/modules/i82365.c
-@device_driver_group_pcmcia_TRUE@am__objects_103 = linux/pcmcia-cs/glue/liblinux_pcmcia_cs_modules_a-pcmcia.$(OBJEXT) \
+@device_driver_group_pcmcia_TRUE@am__objects_104 = linux/pcmcia-cs/glue/liblinux_pcmcia_cs_modules_a-pcmcia.$(OBJEXT) \
 @device_driver_group_pcmcia_TRUE@	linux/pcmcia-cs/modules/liblinux_pcmcia_cs_modules_a-cs.$(OBJEXT) \
 @device_driver_group_pcmcia_TRUE@	linux/pcmcia-cs/modules/liblinux_pcmcia_cs_modules_a-ds.$(OBJEXT) \
 @device_driver_group_pcmcia_TRUE@	linux/pcmcia-cs/modules/liblinux_pcmcia_cs_modules_a-rsrc_mgr.$(OBJEXT) \
 @device_driver_group_pcmcia_TRUE@	linux/pcmcia-cs/modules/liblinux_pcmcia_cs_modules_a-bulkmem.$(OBJEXT) \
 @device_driver_group_pcmcia_TRUE@	linux/pcmcia-cs/modules/liblinux_pcmcia_cs_modules_a-cistpl.$(OBJEXT) \
 @device_driver_group_pcmcia_TRUE@	linux/pcmcia-cs/modules/liblinux_pcmcia_cs_modules_a-pci_fixup.$(OBJEXT)
-@device_driver_i82365_TRUE@am__objects_104 = linux/pcmcia-cs/modules/liblinux_pcmcia_cs_modules_a-i82365.$(OBJEXT)
-am_liblinux_pcmcia_cs_modules_a_OBJECTS = $(am__objects_103) \
-	$(am__objects_104)
+@device_driver_i82365_TRUE@am__objects_105 = linux/pcmcia-cs/modules/liblinux_pcmcia_cs_modules_a-i82365.$(OBJEXT)
+am_liblinux_pcmcia_cs_modules_a_OBJECTS = $(am__objects_104) \
+	$(am__objects_105)
 liblinux_pcmcia_cs_modules_a_OBJECTS =  \
 	$(am_liblinux_pcmcia_cs_modules_a_OBJECTS)
 liblinux_pcmcia_cs_wireless_a_AR = $(AR) $(ARFLAGS)
@@ -1177,10 +1159,10 @@ am__liblinux_pcmcia_cs_wireless_a_SOURCE
 	linux/pcmcia-cs/wireless/hermes.c \
 	linux/pcmcia-cs/wireless/orinoco.c \
 	linux/pcmcia-cs/wireless/orinoco_cs.c
-@device_driver_orinoco_cs_TRUE@am__objects_105 = linux/pcmcia-cs/wireless/liblinux_pcmcia_cs_wireless_a-hermes.$(OBJEXT) \
+@device_driver_orinoco_cs_TRUE@am__objects_106 = linux/pcmcia-cs/wireless/liblinux_pcmcia_cs_wireless_a-hermes.$(OBJEXT) \
 @device_driver_orinoco_cs_TRUE@	linux/pcmcia-cs/wireless/liblinux_pcmcia_cs_wireless_a-orinoco.$(OBJEXT) \
 @device_driver_orinoco_cs_TRUE@	linux/pcmcia-cs/wireless/liblinux_pcmcia_cs_wireless_a-orinoco_cs.$(OBJEXT)
-am_liblinux_pcmcia_cs_wireless_a_OBJECTS = $(am__objects_105)
+am_liblinux_pcmcia_cs_wireless_a_OBJECTS = $(am__objects_106)
 liblinux_pcmcia_cs_wireless_a_OBJECTS =  \
 	$(am_liblinux_pcmcia_cs_wireless_a_OBJECTS)
 am__installdirs = "$(DESTDIR)$(exec_bootdir)" "$(DESTDIR)$(infodir)" \
@@ -1219,14 +1201,13 @@ DIST_SOURCES = $(am__libkernel_a_SOURCES
 	$(am__liblinux_pcmcia_cs_modules_a_SOURCES_DIST) \
 	$(am__liblinux_pcmcia_cs_wireless_a_SOURCES_DIST) \
 	$(gnumach_SOURCES) $(gnumach_o_SOURCES)
-INFO_DEPS = $(srcdir)/doc/mach.info
 TEXINFO_TEX = $(top_srcdir)/build-aux/texinfo.tex
 am__TEXINFO_TEX_DIR = $(top_srcdir)/build-aux
-DVIS = doc/mach.dvi
-PDFS = doc/mach.pdf
-PSS = doc/mach.ps
-HTMLS = doc/mach.html
-TEXINFOS = doc/mach.texi
+DVIS =
+PDFS =
+PSS =
+HTMLS =
+TEXINFOS =
 TEXI2DVI = texi2dvi
 TEXI2PDF = $(TEXI2DVI) --pdf --batch
 MAKEINFOHTML = $(MAKEINFO) --html
@@ -1408,7 +1389,7 @@ noinst_LIBRARIES = libkernel.a lib_dep_t
 	liblinux_pcmcia_cs_modules.a liblinux_pcmcia_cs_clients.a \
 	liblinux_pcmcia_cs_wireless.a
 TESTS = tests/test-mbchk
-info_TEXINFOS = doc/mach.texi
+info_TEXINFOS = 
 #	kern/mach.server.defs
 #	kern/mach4.server.defs
 #	kern/mach_debug.server.defs
@@ -1479,12 +1460,12 @@ libkernel_a_SOURCES = $(am__append_1) ip
 	kern/boot_script.c util/putchar.c util/puts.c vm/vm_debug.c \
 	vm/vm_external.c vm/vm_fault.c vm/vm_init.c vm/vm_kern.c \
 	vm/vm_map.c vm/vm_object.c vm/vm_pageout.c vm/vm_resident.c \
-	vm/vm_user.c vm/memory_object.c device/cons.c \
-	device/dev_lookup.c device/dev_name.c device/dev_pager.c \
-	device/device_init.c device/ds_routines.c device/subrs.c \
-	device/net_io.c device/blkio.c device/chario.c $(am__append_2) \
-	version.c $(am__append_3) $(am__append_4) $(am__append_5) \
-	$(am__append_6) $(am__append_7)
+	vm/vm_user.c vm/memory_object_proxy.c vm/memory_object.c \
+	device/cons.c device/dev_lookup.c device/dev_name.c \
+	device/dev_pager.c device/device_init.c device/ds_routines.c \
+	device/subrs.c device/net_io.c device/blkio.c device/chario.c \
+	$(am__append_2) version.c $(am__append_3) $(am__append_4) \
+	$(am__append_5) $(am__append_6) $(am__append_7)
 nodist_libkernel_a_SOURCES = vm/memory_object_user.user.h \
 	vm/memory_object_user.user.c vm/memory_object_default.user.h \
 	vm/memory_object_default.user.c device/device_reply.user.h \
@@ -1642,9 +1623,6 @@ exec_msgids_DATA = gnumach.msgids
 @HOST_i386_TRUE@	i386/include/mach/i386/vm_param.h \
 @HOST_i386_TRUE@	i386/include/mach/i386/vm_types.h
 
-mach_TEXINFOS = \
-	doc/fdl.texi doc/gpl.texi
-
 liblinux_a_CPPFLAGS = $(AM_CPPFLAGS) \
 	-I$(srcdir)/$(systype)/linux/dev/include \
 	-I$(top_builddir)/linux/dev/include \
@@ -1697,7 +1675,8 @@ liblinux_a_SOURCES = linux/dev/init/vers
 	$(am__append_83) $(am__append_84) $(am__append_85) \
 	$(am__append_86) $(am__append_87) $(am__append_88) \
 	$(am__append_89) $(am__append_90) $(am__append_91) \
-	$(am__append_92) $(am__append_93) $(am__append_105)
+	$(am__append_92) $(am__append_93) $(am__append_94) \
+	$(am__append_106)
 
 # pcmcia-cs.
 liblinux_pcmcia_cs_modules_a_CPPFLAGS = $(liblinux_a_CPPFLAGS) \
@@ -1706,25 +1685,25 @@ liblinux_pcmcia_cs_modules_a_CPPFLAGS = 
 liblinux_pcmcia_cs_modules_a_CFLAGS = $(liblinux_a_CFLAGS) \
 	-include $(srcdir)/linux/pcmcia-cs/glue/pcmcia_glue.h
 
-liblinux_pcmcia_cs_modules_a_SOURCES = $(am__append_94) \
-	$(am__append_95)
+liblinux_pcmcia_cs_modules_a_SOURCES = $(am__append_95) \
+	$(am__append_96)
 liblinux_pcmcia_cs_clients_a_CPPFLAGS = $(liblinux_a_CPPFLAGS) \
 	-DPCMCIA_CLIENT -I$(srcdir)/linux/pcmcia-cs/include
 
 liblinux_pcmcia_cs_clients_a_CFLAGS = $(liblinux_a_CFLAGS) \
 	-include $(srcdir)/linux/pcmcia-cs/glue/pcmcia_glue.h
 
-liblinux_pcmcia_cs_clients_a_SOURCES = $(am__append_96) \
-	$(am__append_97) $(am__append_98) $(am__append_99) \
-	$(am__append_100) $(am__append_101) $(am__append_102) \
-	$(am__append_103)
+liblinux_pcmcia_cs_clients_a_SOURCES = $(am__append_97) \
+	$(am__append_98) $(am__append_99) $(am__append_100) \
+	$(am__append_101) $(am__append_102) $(am__append_103) \
+	$(am__append_104)
 liblinux_pcmcia_cs_wireless_a_CPPFLAGS = $(liblinux_a_CPPFLAGS) \
 	-I$(srcdir)/linux/pcmcia-cs/include
 
 liblinux_pcmcia_cs_wireless_a_CFLAGS = $(liblinux_a_CFLAGS) \
 	-include $(srcdir)/linux/pcmcia-cs/glue/wireless_glue.h
 
-liblinux_pcmcia_cs_wireless_a_SOURCES = $(am__append_104)
+liblinux_pcmcia_cs_wireless_a_SOURCES = $(am__append_105)
 
 # Makerules: how to do some things.
 
@@ -1733,6 +1712,7 @@ liblinux_pcmcia_cs_wireless_a_SOURCES = 
 # Test suite.
 
 # Documentation.
+#include doc/Makefrag.am
 
 # Linux device drivers and the glue code.
 
@@ -1748,9 +1728,9 @@ gnumach_o_SOURCES = 
 gnumach_o_LINK = $(LD) -u _start -r -o $@ --start-group
 
 # This is the list of routines we decide is OK to steal from the C library.
-clib_routines := memcpy memmove memset bcopy bzero \
-		 strchr strstr strsep strpbrk strtok \
-		 htonl htons ntohl ntohs \
+clib_routines := memcpy memmove memset bcopy bzero		\
+		 strchr strstr strsep strpbrk strtok		\
+		 htonl htons ntohl ntohs			\
 		 etext edata end # actually ld magic, not libc.
 
 gnumach_SOURCES = 
@@ -1770,7 +1750,7 @@ all: config.h
 .SUFFIXES: .S .c .dvi .o .obj .ps
 am--refresh:
 	@:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/Makerules.am $(srcdir)/Makefrag.am $(srcdir)/i386/Makefrag.am $(srcdir)/tests/Makefrag.am $(srcdir)/doc/Makefrag.am $(srcdir)/linux/Makefrag.am $(srcdir)/i386/linux/Makefrag.am $(am__configure_deps)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/Makerules.am $(srcdir)/Makefrag.am $(srcdir)/i386/Makefrag.am $(srcdir)/tests/Makefrag.am $(srcdir)/linux/Makefrag.am $(srcdir)/i386/linux/Makefrag.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -2074,6 +2054,8 @@ vm/vm_pageout.$(OBJEXT): vm/$(am__dirsta
 vm/vm_resident.$(OBJEXT): vm/$(am__dirstamp) \
 	vm/$(DEPDIR)/$(am__dirstamp)
 vm/vm_user.$(OBJEXT): vm/$(am__dirstamp) vm/$(DEPDIR)/$(am__dirstamp)
+vm/memory_object_proxy.$(OBJEXT): vm/$(am__dirstamp) \
+	vm/$(DEPDIR)/$(am__dirstamp)
 vm/memory_object.$(OBJEXT): vm/$(am__dirstamp) \
 	vm/$(DEPDIR)/$(am__dirstamp)
 device/cons.$(OBJEXT): device/$(am__dirstamp) \
@@ -2672,6 +2654,9 @@ linux/src/drivers/net/liblinux_a-rtl8139
 linux/src/drivers/net/liblinux_a-seeq8005.$(OBJEXT):  \
 	linux/src/drivers/net/$(am__dirstamp) \
 	linux/src/drivers/net/$(DEPDIR)/$(am__dirstamp)
+linux/src/drivers/net/liblinux_a-sis900.$(OBJEXT):  \
+	linux/src/drivers/net/$(am__dirstamp) \
+	linux/src/drivers/net/$(DEPDIR)/$(am__dirstamp)
 linux/src/drivers/net/liblinux_a-sk_g16.$(OBJEXT):  \
 	linux/src/drivers/net/$(am__dirstamp) \
 	linux/src/drivers/net/$(DEPDIR)/$(am__dirstamp)
@@ -3105,6 +3090,7 @@ mostlyclean-compile:
 	-rm -f linux/src/drivers/net/liblinux_a-pcnet32.$(OBJEXT)
 	-rm -f linux/src/drivers/net/liblinux_a-rtl8139.$(OBJEXT)
 	-rm -f linux/src/drivers/net/liblinux_a-seeq8005.$(OBJEXT)
+	-rm -f linux/src/drivers/net/liblinux_a-sis900.$(OBJEXT)
 	-rm -f linux/src/drivers/net/liblinux_a-sk_g16.$(OBJEXT)
 	-rm -f linux/src/drivers/net/liblinux_a-smc-ultra.$(OBJEXT)
 	-rm -f linux/src/drivers/net/liblinux_a-smc-ultra32.$(OBJEXT)
@@ -3163,6 +3149,7 @@ mostlyclean-compile:
 	-rm -f vm/lib_dep_tr_for_defs_a-memory_object_user.user.defs.$(OBJEXT)
 	-rm -f vm/memory_object.$(OBJEXT)
 	-rm -f vm/memory_object_default.user.$(OBJEXT)
+	-rm -f vm/memory_object_proxy.$(OBJEXT)
 	-rm -f vm/memory_object_user.user.$(OBJEXT)
 	-rm -f vm/vm_debug.$(OBJEXT)
 	-rm -f vm/vm_external.$(OBJEXT)
@@ -3435,6 +3422,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@linux/src/drivers/net/$(DEPDIR)/liblinux_a-pcnet32.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@linux/src/drivers/net/$(DEPDIR)/liblinux_a-rtl8139.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@linux/src/drivers/net/$(DEPDIR)/liblinux_a-seeq8005.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@linux/src/drivers/net/$(DEPDIR)/liblinux_a-sis900.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@linux/src/drivers/net/$(DEPDIR)/liblinux_a-sk_g16.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@linux/src/drivers/net/$(DEPDIR)/liblinux_a-smc-ultra.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@linux/src/drivers/net/$(DEPDIR)/liblinux_a-smc-ultra32.Po@am__quote@
@@ -3493,6 +3481,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@vm/$(DEPDIR)/lib_dep_tr_for_defs_a-memory_object_user.user.defs.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@vm/$(DEPDIR)/memory_object.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@vm/$(DEPDIR)/memory_object_default.user.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@vm/$(DEPDIR)/memory_object_proxy.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@vm/$(DEPDIR)/memory_object_user.user.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@vm/$(DEPDIR)/vm_debug.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@vm/$(DEPDIR)/vm_external.Po@am__quote@
@@ -5231,6 +5220,20 @@ linux/src/drivers/net/liblinux_a-seeq800
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblinux_a_CPPFLAGS) $(CPPFLAGS) $(liblinux_a_CFLAGS) $(CFLAGS) -c -o linux/src/drivers/net/liblinux_a-seeq8005.obj `if test -f 'linux/src/drivers/net/seeq8005.c'; then $(CYGPATH_W) 'linux/src/drivers/net/seeq8005.c'; else $(CYGPATH_W) '$(srcdir)/linux/src/drivers/net/seeq8005.c'; fi`
 
+linux/src/drivers/net/liblinux_a-sis900.o: linux/src/drivers/net/sis900.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblinux_a_CPPFLAGS) $(CPPFLAGS) $(liblinux_a_CFLAGS) $(CFLAGS) -MT linux/src/drivers/net/liblinux_a-sis900.o -MD -MP -MF linux/src/drivers/net/$(DEPDIR)/liblinux_a-sis900.Tpo -c -o linux/src/drivers/net/liblinux_a-sis900.o `test -f 'linux/src/drivers/net/sis900.c' || echo '$(srcdir)/'`linux/src/drivers/net/sis900.c
+@am__fastdepCC_TRUE@	mv -f linux/src/drivers/net/$(DEPDIR)/liblinux_a-sis900.Tpo linux/src/drivers/net/$(DEPDIR)/liblinux_a-sis900.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='linux/src/drivers/net/sis900.c' object='linux/src/drivers/net/liblinux_a-sis900.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblinux_a_CPPFLAGS) $(CPPFLAGS) $(liblinux_a_CFLAGS) $(CFLAGS) -c -o linux/src/drivers/net/liblinux_a-sis900.o `test -f 'linux/src/drivers/net/sis900.c' || echo '$(srcdir)/'`linux/src/drivers/net/sis900.c
+
+linux/src/drivers/net/liblinux_a-sis900.obj: linux/src/drivers/net/sis900.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblinux_a_CPPFLAGS) $(CPPFLAGS) $(liblinux_a_CFLAGS) $(CFLAGS) -MT linux/src/drivers/net/liblinux_a-sis900.obj -MD -MP -MF linux/src/drivers/net/$(DEPDIR)/liblinux_a-sis900.Tpo -c -o linux/src/drivers/net/liblinux_a-sis900.obj `if test -f 'linux/src/drivers/net/sis900.c'; then $(CYGPATH_W) 'linux/src/drivers/net/sis900.c'; else $(CYGPATH_W) '$(srcdir)/linux/src/drivers/net/sis900.c'; fi`
+@am__fastdepCC_TRUE@	mv -f linux/src/drivers/net/$(DEPDIR)/liblinux_a-sis900.Tpo linux/src/drivers/net/$(DEPDIR)/liblinux_a-sis900.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='linux/src/drivers/net/sis900.c' object='linux/src/drivers/net/liblinux_a-sis900.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblinux_a_CPPFLAGS) $(CPPFLAGS) $(liblinux_a_CFLAGS) $(CFLAGS) -c -o linux/src/drivers/net/liblinux_a-sis900.obj `if test -f 'linux/src/drivers/net/sis900.c'; then $(CYGPATH_W) 'linux/src/drivers/net/sis900.c'; else $(CYGPATH_W) '$(srcdir)/linux/src/drivers/net/sis900.c'; fi`
+
 linux/src/drivers/net/liblinux_a-sk_g16.o: linux/src/drivers/net/sk_g16.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblinux_a_CPPFLAGS) $(CPPFLAGS) $(liblinux_a_CFLAGS) $(CFLAGS) -MT linux/src/drivers/net/liblinux_a-sk_g16.o -MD -MP -MF linux/src/drivers/net/$(DEPDIR)/liblinux_a-sk_g16.Tpo -c -o linux/src/drivers/net/liblinux_a-sk_g16.o `test -f 'linux/src/drivers/net/sk_g16.c' || echo '$(srcdir)/'`linux/src/drivers/net/sk_g16.c
 @am__fastdepCC_TRUE@	mv -f linux/src/drivers/net/$(DEPDIR)/liblinux_a-sk_g16.Tpo linux/src/drivers/net/$(DEPDIR)/liblinux_a-sk_g16.Po
@@ -5692,75 +5695,6 @@ linux/pcmcia-cs/wireless/liblinux_pcmcia
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='linux/pcmcia-cs/wireless/orinoco_cs.c' object='linux/pcmcia-cs/wireless/liblinux_pcmcia_cs_wireless_a-orinoco_cs.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblinux_pcmcia_cs_wireless_a_CPPFLAGS) $(CPPFLAGS) $(liblinux_pcmcia_cs_wireless_a_CFLAGS) $(CFLAGS) -c -o linux/pcmcia-cs/wireless/liblinux_pcmcia_cs_wireless_a-orinoco_cs.obj `if test -f 'linux/pcmcia-cs/wireless/orinoco_cs.c'; then $(CYGPATH_W) 'linux/pcmcia-cs/wireless/orinoco_cs.c'; else $(CYGPATH_W) '$(srcdir)/linux/pcmcia-cs/wireless/orinoco_cs.c'; fi`
-doc/$(am__dirstamp):
-	@$(MKDIR_P) doc
-	@: > doc/$(am__dirstamp)
-
-$(srcdir)/doc/mach.info: doc/mach.texi $(srcdir)/doc/version.texi
-	restore=: && backupdir="$(am__leading_dot)am$$$$" && \
-	am__cwd=`pwd` && cd $(srcdir) && \
-	rm -rf $$backupdir && mkdir $$backupdir && \
-	if ($(MAKEINFO) --version) >/dev/null 2>&1; then \
-	  for f in $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]; do \
-	    if test -f $$f; then mv $$f $$backupdir; restore=mv; else :; fi; \
-	  done; \
-	else :; fi && \
-	cd "$$am__cwd"; \
-	if $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I doc -I $(srcdir)/doc \
-	 -o $@ $(srcdir)/doc/mach.texi; \
-	then \
-	  rc=0; \
-	  cd $(srcdir); \
-	else \
-	  rc=$$?; \
-	  cd $(srcdir) && \
-	  $$restore $$backupdir/* `echo "./$@" | sed 's|[^/]*$$||'`; \
-	fi; \
-	rm -rf $$backupdir; exit $$rc
-
-doc/mach.dvi: doc/mach.texi $(srcdir)/doc/version.texi doc/$(am__dirstamp)
-	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
-	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I doc -I $(srcdir)/doc' \
-	$(TEXI2DVI) -o $@ `test -f 'doc/mach.texi' || echo '$(srcdir)/'`doc/mach.texi
-
-doc/mach.pdf: doc/mach.texi $(srcdir)/doc/version.texi doc/$(am__dirstamp)
-	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
-	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I doc -I $(srcdir)/doc' \
-	$(TEXI2PDF) -o $@ `test -f 'doc/mach.texi' || echo '$(srcdir)/'`doc/mach.texi
-
-doc/mach.html: doc/mach.texi $(srcdir)/doc/version.texi doc/$(am__dirstamp)
-	rm -rf $(@:.html=.htp)
-	if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I doc -I $(srcdir)/doc \
-	 -o $(@:.html=.htp) `test -f 'doc/mach.texi' || echo '$(srcdir)/'`doc/mach.texi; \
-	then \
-	  rm -rf $@; \
-	  if test ! -d $(@:.html=.htp) && test -d $(@:.html=); then \
-	    mv $(@:.html=) $@; else mv $(@:.html=.htp) $@; fi; \
-	else \
-	  if test ! -d $(@:.html=.htp) && test -d $(@:.html=); then \
-	    rm -rf $(@:.html=); else rm -Rf $(@:.html=.htp) $@; fi; \
-	  exit 1; \
-	fi
-$(srcdir)/doc/version.texi:  $(srcdir)/doc/stamp-vti
-$(srcdir)/doc/stamp-vti: doc/mach.texi $(top_srcdir)/configure
-	test -f doc/$(am__dirstamp) || $(MAKE) $(AM_MAKEFLAGS) doc/$(am__dirstamp)
-	@(dir=.; test -f ./doc/mach.texi || dir=$(srcdir); \
-	set `$(SHELL) $(top_srcdir)/build-aux/mdate-sh $$dir/doc/mach.texi`; \
-	echo "@set UPDATED $$1 $$2 $$3"; \
-	echo "@set UPDATED-MONTH $$2 $$3"; \
-	echo "@set EDITION $(VERSION)"; \
-	echo "@set VERSION $(VERSION)") > vti.tmp
-	@cmp -s vti.tmp $(srcdir)/doc/version.texi \
-	  || (echo "Updating $(srcdir)/doc/version.texi"; \
-	      cp vti.tmp $(srcdir)/doc/version.texi)
-	-@rm -f vti.tmp
-	@cp $(srcdir)/doc/version.texi $@
-
-mostlyclean-vti:
-	-rm -f vti.tmp
-
-maintainer-clean-vti:
-	-rm -f $(srcdir)/doc/stamp-vti $(srcdir)/doc/version.texi
 .dvi.ps:
 	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
 	$(DVIPS) -o $@ $<
@@ -5839,9 +5773,7 @@ dist-info: $(INFO_DEPS)
 	done
 
 mostlyclean-aminfo:
-	-rm -rf mach.aux mach.cp mach.cps mach.fn mach.fns mach.ky mach.kys mach.log \
-	  mach.pg mach.tmp mach.toc mach.tp mach.vr doc/mach.dvi \
-	  doc/mach.pdf doc/mach.ps doc/mach.html
+	-rm -rf 
 
 maintainer-clean-aminfo:
 	@list='$(INFO_DEPS)'; for i in $$list; do \
@@ -6321,7 +6253,6 @@ distclean-generic:
 	-rm -f ddb/$(am__dirstamp)
 	-rm -f device/$(DEPDIR)/$(am__dirstamp)
 	-rm -f device/$(am__dirstamp)
-	-rm -f doc/$(am__dirstamp)
 	-rm -f i386/i386/$(DEPDIR)/$(am__dirstamp)
 	-rm -f i386/i386/$(am__dirstamp)
 	-rm -f i386/i386at/$(DEPDIR)/$(am__dirstamp)
@@ -6505,12 +6436,12 @@ maintainer-clean: maintainer-clean-recur
 	-rm -rf ./$(DEPDIR) chips/$(DEPDIR) ddb/$(DEPDIR) device/$(DEPDIR) i386/i386/$(DEPDIR) i386/i386at/$(DEPDIR) i386/intel/$(DEPDIR) ipc/$(DEPDIR) kern/$(DEPDIR) linux/dev/arch/i386/kernel/$(DEPDIR) linux/dev/drivers/block/$(DEPDIR) linux/dev/drivers/net/$(DEPDIR) linux/dev/drivers/scsi/$(DEPDIR) linux/dev/glue/$(DEPDIR) linux/dev/init/$(DEPDIR) linux/dev/kernel/$(DEPDIR) linux/dev/lib/$(DEPDIR) linux/dev/net/core/$(DEPDIR) linux/pcmcia-cs/clients/$(DEPDIR) linux/pcmcia-cs/glue/$(DEPDIR) linux/pcmcia-cs/modules/$(DEPDIR) linux/pcmcia-cs/wireless/$(DEPDIR) linux/src/arch/i386/kernel/$(DEPDIR) linux/src/arch/i386/lib/$(DEPDIR) linux/src/drivers/block/$(DEPDIR) linux/src/drivers/net/$(DEPDIR) linux/src/drivers/pci/$(DEPDIR) linux/src/drivers/scsi/$(DEPDIR) linux/src/lib/$(DEPDIR) util/$(DEPDIR) vm/$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-aminfo \
-	maintainer-clean-generic maintainer-clean-vti
+	maintainer-clean-generic
 
 mostlyclean: mostlyclean-recursive
 
 mostlyclean-am: mostlyclean-aminfo mostlyclean-compile \
-	mostlyclean-generic mostlyclean-vti
+	mostlyclean-generic
 
 pdf: pdf-recursive
 
@@ -6548,9 +6479,8 @@ uninstall-am: uninstall-dvi-am uninstall
 	install-man install-pdf install-pdf-am install-ps \
 	install-ps-am install-strip installcheck installcheck-am \
 	installdirs installdirs-am maintainer-clean \
-	maintainer-clean-aminfo maintainer-clean-generic \
-	maintainer-clean-vti mostlyclean mostlyclean-aminfo \
-	mostlyclean-compile mostlyclean-generic mostlyclean-vti pdf \
+	maintainer-clean-aminfo maintainer-clean-generic mostlyclean \
+	mostlyclean-aminfo mostlyclean-compile mostlyclean-generic pdf \
 	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
 	uninstall-dvi-am uninstall-exec_bootPROGRAMS \
 	uninstall-exec_msgidsDATA uninstall-html-am \
@@ -6690,7 +6620,7 @@ gnumach.msgids: $(nodist_lib_dep_tr_for_
 #
 gnumach-undef: gnumach.$(OBJEXT)
 	$(NM) -u $< | sed 's/  *U  *//;s/^_*//' | sort -u > $@
-gnumach-undef-bad: gnumach-undef
+gnumach-undef-bad: gnumach-undef Makefile
 	sed '$(foreach r,$(clib_routines),/^$r$$/d;)' $< > $@
 clib-routines.o: gnumach-undef gnumach-undef-bad
 	if test -s gnumach-undef-bad; \