summaryrefslogtreecommitdiff
path: root/target/linux/etrax/patches/cris/001-include-cris.patch
blob: f384684414ec2f34b909bb858260630c6d83e4e6 (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
1198
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
1250
1251
1252
1253
1254
1255
1256
1257
1258
1259
1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
1297
1298
1299
1300
1301
1302
1303
1304
1305
1306
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
1326
1327
1328
1329
1330
1331
1332
1333
1334
1335
1336
1337
1338
1339
1340
1341
1342
1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354
1355
1356
1357
1358
1359
1360
1361
1362
1363
1364
1365
1366
1367
1368
1369
1370
1371
1372
1373
1374
1375
1376
1377
1378
1379
1380
1381
1382
1383
1384
1385
1386
1387
1388
1389
1390
1391
1392
1393
1394
1395
1396
1397
1398
1399
1400
1401
1402
1403
1404
1405
1406
1407
1408
1409
1410
1411
1412
1413
1414
1415
1416
1417
1418
1419
1420
1421
1422
1423
1424
1425
1426
1427
1428
1429
1430
1431
1432
1433
1434
1435
1436
1437
1438
1439
1440
1441
1442
1443
1444
1445
1446
1447
1448
1449
1450
1451
1452
1453
1454
1455
1456
1457
1458
1459
1460
1461
1462
1463
1464
1465
1466
1467
1468
1469
1470
1471
1472
1473
1474
1475
1476
1477
1478
1479
1480
1481
1482
1483
1484
1485
1486
1487
1488
1489
1490
1491
1492
1493
1494
1495
1496
1497
1498
1499
1500
1501
1502
1503
1504
1505
1506
1507
1508
1509
1510
1511
1512
1513
1514
1515
1516
1517
1518
1519
1520
1521
1522
1523
1524
1525
1526
1527
1528
1529
1530
1531
1532
1533
1534
1535
1536
1537
1538
1539
1540
1541
1542
1543
1544
1545
1546
1547
1548
1549
1550
1551
1552
1553
1554
1555
1556
1557
1558
1559
1560
1561
1562
1563
1564
1565
1566
1567
1568
1569
1570
1571
1572
1573
1574
1575
1576
1577
1578
1579
1580
1581
1582
1583
1584
1585
1586
1587
1588
1589
1590
1591
1592
1593
1594
1595
1596
1597
1598
1599
1600
1601
1602
1603
1604
1605
1606
1607
1608
1609
1610
1611
1612
1613
1614
1615
1616
1617
1618
1619
1620
1621
1622
1623
1624
1625
1626
1627
1628
1629
1630
1631
1632
1633
1634
1635
1636
1637
1638
1639
1640
1641
1642
1643
1644
1645
1646
1647
1648
1649
1650
1651
1652
1653
1654
1655
1656
1657
1658
1659
1660
1661
1662
1663
1664
1665
1666
1667
1668
1669
1670
1671
1672
1673
1674
1675
1676
1677
1678
1679
1680
1681
1682
1683
1684
1685
1686
1687
1688
1689
1690
1691
1692
1693
1694
1695
1696
1697
1698
1699
1700
1701
1702
1703
1704
1705
1706
1707
1708
1709
1710
1711
1712
1713
1714
1715
1716
1717
1718
1719
1720
1721
1722
1723
1724
1725
1726
1727
1728
1729
1730
1731
1732
1733
1734
1735
1736
1737
1738
1739
1740
1741
1742
1743
1744
1745
1746
1747
1748
1749
1750
1751
1752
1753
1754
1755
1756
1757
1758
1759
1760
1761
1762
1763
1764
1765
1766
1767
1768
1769
1770
1771
1772
1773
1774
1775
1776
1777
1778
1779
1780
1781
1782
1783
1784
1785
1786
1787
1788
1789
1790
1791
1792
1793
1794
1795
1796
1797
1798
1799
1800
1801
1802
1803
1804
1805
1806
1807
1808
1809
1810
1811
1812
1813
1814
1815
1816
1817
1818
1819
1820
1821
1822
1823
1824
1825
1826
1827
1828
1829
1830
1831
1832
1833
1834
1835
1836
1837
1838
1839
1840
1841
1842
1843
1844
1845
1846
1847
1848
1849
1850
1851
1852
1853
1854
1855
1856
1857
1858
1859
1860
1861
1862
1863
1864
1865
1866
1867
1868
1869
1870
1871
1872
1873
1874
1875
1876
1877
1878
1879
1880
1881
1882
1883
1884
1885
1886
1887
1888
1889
1890
1891
1892
1893
1894
1895
1896
1897
1898
1899
1900
1901
1902
1903
1904
1905
1906
1907
1908
1909
1910
1911
1912
1913
1914
1915
1916
1917
1918
1919
1920
1921
1922
1923
1924
1925
1926
1927
1928
1929
1930
1931
1932
1933
1934
1935
1936
1937
1938
1939
1940
1941
1942
1943
1944
1945
1946
1947
1948
1949
1950
1951
1952
1953
1954
1955
1956
1957
1958
1959
1960
1961
1962
1963
1964
1965
1966
1967
1968
1969
1970
1971
1972
1973
1974
1975
1976
1977
1978
1979
1980
1981
1982
1983
1984
1985
1986
1987
1988
1989
1990
1991
1992
1993
1994
1995
1996
1997
1998
1999
2000
2001
2002
2003
2004
2005
2006
2007
2008
2009
2010
2011
2012
2013
2014
2015
2016
2017
2018
2019
2020
2021
2022
2023
2024
2025
2026
2027
2028
2029
2030
2031
2032
2033
2034
2035
2036
2037
2038
2039
2040
2041
2042
2043
2044
2045
2046
2047
2048
2049
2050
2051
2052
2053
2054
2055
2056
2057
2058
2059
2060
2061
2062
2063
2064
2065
2066
2067
2068
2069
2070
2071
2072
2073
2074
2075
2076
2077
2078
2079
2080
2081
2082
2083
2084
2085
2086
2087
2088
2089
2090
2091
2092
2093
2094
2095
2096
2097
2098
2099
2100
2101
2102
2103
2104
2105
2106
2107
2108
2109
2110
2111
2112
2113
2114
2115
2116
2117
2118
2119
2120
2121
2122
2123
2124
2125
2126
2127
2128
2129
2130
2131
2132
2133
2134
2135
2136
2137
2138
2139
2140
2141
2142
2143
2144
2145
2146
2147
2148
2149
2150
2151
2152
2153
2154
2155
2156
2157
2158
2159
2160
2161
2162
2163
2164
2165
2166
2167
2168
2169
2170
2171
2172
2173
2174
2175
2176
2177
2178
2179
2180
2181
2182
2183
2184
2185
2186
2187
2188
2189
2190
2191
2192
2193
2194
2195
2196
2197
2198
2199
2200
2201
2202
2203
2204
2205
2206
2207
2208
2209
2210
2211
2212
2213
2214
2215
2216
2217
2218
2219
2220
2221
2222
2223
2224
2225
2226
2227
2228
2229
2230
2231
2232
2233
2234
2235
2236
2237
2238
2239
2240
2241
2242
2243
2244
2245
2246
2247
2248
2249
2250
2251
2252
2253
2254
2255
2256
2257
2258
2259
2260
2261
2262
2263
2264
2265
2266
2267
2268
2269
2270
2271
2272
2273
2274
2275
2276
2277
2278
2279
2280
2281
2282
2283
2284
2285
2286
2287
2288
2289
2290
2291
2292
2293
2294
2295
2296
2297
2298
2299
2300
2301
2302
2303
2304
2305
2306
2307
2308
2309
2310
2311
2312
2313
2314
2315
2316
2317
2318
2319
2320
2321
2322
2323
2324
2325
2326
2327
2328
2329
2330
2331
2332
2333
2334
2335
2336
2337
2338
2339
2340
2341
2342
2343
2344
2345
2346
2347
2348
2349
2350
2351
2352
2353
2354
2355
2356
2357
2358
2359
2360
2361
2362
2363
2364
2365
2366
2367
2368
2369
2370
2371
2372
2373
2374
2375
2376
2377
2378
2379
2380
2381
2382
2383
2384
2385
2386
2387
2388
2389
2390
2391
2392
2393
2394
2395
2396
2397
2398
2399
2400
2401
2402
2403
2404
2405
2406
2407
2408
2409
2410
2411
2412
2413
2414
2415
2416
2417
2418
2419
2420
2421
2422
2423
2424
2425
2426
2427
2428
2429
2430
2431
2432
2433
2434
2435
2436
2437
2438
2439
2440
2441
2442
2443
2444
2445
2446
2447
2448
2449
2450
2451
2452
2453
2454
2455
2456
2457
2458
2459
2460
2461
2462
2463
2464
2465
2466
2467
2468
2469
2470
2471
2472
2473
2474
2475
2476
2477
2478
2479
2480
2481
2482
2483
2484
2485
2486
2487
2488
2489
2490
2491
2492
2493
2494
2495
2496
2497
2498
2499
2500
2501
2502
2503
2504
2505
2506
2507
2508
2509
2510
2511
2512
2513
2514
2515
2516
2517
2518
2519
2520
2521
2522
2523
2524
2525
2526
2527
2528
2529
2530
2531
2532
2533
2534
2535
2536
2537
2538
2539
2540
2541
2542
2543
2544
2545
2546
2547
2548
2549
2550
2551
2552
2553
2554
2555
2556
2557
2558
2559
2560
2561
2562
2563
2564
2565
2566
2567
2568
2569
2570
2571
2572
2573
2574
2575
2576
2577
2578
2579
2580
2581
2582
2583
2584
2585
2586
2587
2588
2589
2590
2591
2592
2593
2594
2595
2596
2597
2598
2599
2600
2601
2602
2603
2604
2605
2606
2607
2608
2609
2610
2611
2612
2613
2614
2615
2616
2617
2618
2619
2620
2621
2622
2623
2624
2625
2626
2627
2628
2629
2630
2631
2632
2633
2634
2635
2636
2637
2638
2639
2640
2641
2642
2643
2644
2645
2646
2647
2648
2649
2650
2651
2652
2653
2654
2655
2656
2657
2658
2659
2660
2661
2662
2663
2664
2665
2666
2667
2668
2669
2670
2671
2672
2673
2674
2675
2676
2677
2678
2679
2680
2681
2682
2683
2684
2685
2686
2687
2688
2689
2690
2691
2692
2693
2694
2695
2696
2697
2698
2699
2700
2701
2702
2703
2704
2705
2706
2707
2708
2709
2710
2711
2712
2713
2714
2715
2716
2717
2718
2719
2720
2721
2722
2723
2724
2725
2726
2727
2728
2729
2730
2731
2732
2733
2734
2735
2736
2737
2738
2739
2740
2741
2742
2743
2744
2745
2746
2747
2748
2749
2750
2751
2752
2753
2754
2755
2756
2757
2758
2759
2760
2761
2762
2763
2764
2765
2766
2767
2768
2769
2770
2771
2772
2773
2774
2775
2776
2777
2778
2779
2780
2781
2782
2783
2784
2785
2786
2787
2788
2789
2790
2791
2792
2793
2794
2795
2796
2797
2798
2799
2800
2801
2802
2803
2804
2805
2806
2807
2808
2809
2810
2811
2812
2813
2814
2815
2816
2817
2818
2819
2820
2821
2822
2823
2824
2825
2826
2827
2828
2829
2830
2831
2832
2833
2834
2835
2836
2837
2838
2839
2840
2841
2842
2843
2844
2845
2846
2847
2848
2849
2850
2851
2852
2853
2854
2855
2856
2857
2858
2859
2860
2861
2862
2863
2864
2865
2866
2867
2868
2869
2870
2871
2872
2873
2874
2875
2876
2877
2878
2879
2880
2881
2882
2883
2884
2885
2886
2887
2888
2889
2890
2891
2892
2893
2894
2895
2896
2897
2898
2899
2900
2901
2902
2903
2904
2905
2906
2907
2908
2909
2910
2911
2912
2913
2914
2915
2916
2917
2918
2919
2920
2921
2922
2923
2924
2925
2926
2927
2928
2929
2930
2931
2932
2933
2934
2935
2936
2937
2938
2939
2940
2941
2942
2943
2944
2945
2946
2947
2948
2949
2950
2951
2952
2953
2954
2955
2956
2957
2958
2959
2960
2961
2962
2963
2964
2965
2966
2967
2968
2969
2970
2971
2972
2973
2974
2975
2976
2977
2978
2979
2980
2981
2982
2983
2984
2985
2986
2987
2988
2989
2990
2991
2992
2993
2994
2995
2996
2997
2998
2999
3000
3001
3002
3003
3004
3005
3006
3007
3008
3009
3010
3011
3012
3013
3014
3015
3016
3017
3018
3019
3020
3021
3022
3023
3024
3025
3026
3027
3028
3029
3030
3031
3032
3033
3034
3035
3036
3037
3038
3039
3040
3041
3042
3043
3044
3045
3046
3047
3048
3049
3050
3051
3052
3053
3054
3055
3056
3057
3058
3059
3060
3061
3062
3063
3064
3065
3066
3067
3068
3069
3070
3071
3072
3073
3074
3075
3076
3077
3078
3079
3080
3081
3082
3083
3084
3085
3086
3087
3088
3089
3090
3091
3092
3093
3094
3095
3096
3097
3098
3099
3100
3101
3102
3103
3104
3105
3106
3107
3108
3109
3110
3111
3112
3113
3114
3115
3116
3117
3118
3119
3120
3121
3122
3123
3124
3125
3126
3127
3128
3129
3130
3131
3132
3133
3134
3135
3136
3137
3138
3139
3140
3141
3142
3143
3144
3145
3146
3147
3148
3149
3150
3151
3152
3153
3154
3155
3156
3157
3158
3159
3160
3161
3162
3163
3164
3165
3166
3167
3168
3169
3170
3171
3172
3173
3174
3175
3176
3177
3178
3179
3180
3181
3182
3183
3184
3185
3186
3187
3188
3189
3190
3191
3192
3193
3194
3195
3196
3197
3198
3199
3200
3201
3202
3203
3204
3205
3206
3207
3208
3209
3210
3211
3212
3213
3214
3215
3216
3217
3218
3219
3220
3221
3222
3223
3224
3225
3226
3227
3228
3229
3230
3231
3232
3233
3234
3235
3236
3237
3238
3239
3240
3241
3242
3243
3244
3245
3246
3247
3248
3249
3250
3251
3252
3253
3254
3255
3256
3257
3258
3259
3260
3261
3262
3263
3264
3265
3266
3267
3268
3269
3270
3271
3272
3273
3274
3275
3276
3277
3278
3279
3280
3281
3282
3283
3284
3285
3286
3287
3288
3289
3290
3291
3292
3293
3294
3295
3296
3297
3298
3299
3300
3301
3302
3303
3304
3305
3306
3307
3308
3309
3310
3311
3312
3313
3314
3315
3316
3317
3318
3319
3320
3321
3322
3323
3324
3325
3326
3327
3328
3329
3330
3331
3332
3333
3334
3335
3336
3337
3338
3339
3340
3341
3342
3343
3344
3345
3346
3347
3348
3349
3350
3351
3352
3353
3354
3355
3356
3357
3358
3359
3360
3361
3362
3363
3364
3365
3366
3367
3368
3369
3370
3371
3372
3373
3374
3375
3376
3377
3378
3379
3380
3381
3382
3383
3384
3385
3386
3387
3388
3389
3390
3391
3392
3393
3394
3395
3396
3397
3398
3399
3400
3401
3402
3403
3404
3405
3406
3407
3408
3409
3410
3411
3412
3413
3414
3415
3416
3417
3418
3419
3420
3421
3422
3423
3424
3425
3426
3427
3428
3429
3430
3431
3432
3433
3434
3435
3436
3437
3438
3439
3440
3441
3442
3443
3444
3445
3446
3447
3448
3449
3450
3451
3452
3453
3454
3455
3456
3457
3458
3459
3460
3461
3462
3463
3464
3465
3466
3467
3468
3469
3470
3471
3472
3473
3474
3475
3476
3477
3478
3479
3480
3481
3482
3483
3484
3485
3486
3487
3488
3489
3490
3491
3492
3493
3494
3495
3496
3497
3498
3499
3500
3501
3502
3503
3504
3505
3506
3507
3508
3509
3510
3511
3512
3513
3514
3515
3516
3517
3518
3519
3520
3521
3522
3523
3524
3525
3526
3527
3528
3529
3530
3531
3532
3533
3534
3535
3536
3537
3538
3539
3540
3541
3542
3543
3544
3545
3546
3547
3548
3549
3550
3551
3552
3553
3554
3555
3556
3557
3558
3559
3560
3561
3562
3563
3564
3565
3566
3567
3568
3569
3570
3571
3572
3573
3574
3575
3576
3577
3578
3579
3580
3581
3582
3583
3584
3585
3586
3587
3588
3589
3590
3591
3592
3593
3594
3595
3596
3597
3598
3599
3600
3601
3602
3603
3604
3605
3606
3607
3608
3609
3610
3611
3612
3613
3614
3615
3616
3617
3618
3619
3620
3621
3622
3623
3624
3625
3626
3627
3628
3629
3630
3631
3632
3633
3634
3635
3636
3637
3638
3639
3640
3641
3642
3643
3644
3645
3646
3647
3648
3649
3650
3651
3652
3653
3654
3655
3656
3657
3658
3659
3660
3661
3662
3663
3664
3665
3666
3667
3668
3669
3670
3671
3672
3673
3674
3675
3676
3677
3678
3679
3680
3681
3682
3683
3684
3685
3686
3687
3688
3689
3690
3691
3692
3693
3694
3695
3696
3697
3698
3699
3700
3701
3702
3703
3704
3705
3706
3707
3708
3709
3710
3711
3712
3713
3714
3715
3716
3717
3718
3719
3720
3721
3722
3723
3724
3725
3726
3727
3728
3729
3730
3731
3732
3733
3734
3735
3736
3737
3738
3739
3740
3741
3742
3743
3744
3745
3746
3747
3748
3749
3750
3751
3752
3753
3754
3755
3756
3757
3758
3759
3760
3761
3762
3763
3764
3765
3766
3767
3768
3769
3770
3771
3772
3773
3774
3775
3776
3777
3778
3779
3780
3781
3782
3783
3784
3785
3786
3787
3788
3789
3790
3791
3792
3793
3794
3795
3796
3797
3798
3799
3800
3801
3802
3803
3804
3805
3806
3807
3808
3809
3810
3811
3812
3813
3814
3815
3816
3817
3818
3819
3820
3821
3822
3823
3824
3825
3826
3827
3828
3829
3830
3831
3832
3833
3834
3835
3836
3837
3838
3839
3840
3841
3842
3843
3844
3845
3846
3847
3848
3849
3850
3851
3852
3853
3854
3855
3856
3857
3858
3859
3860
3861
3862
3863
3864
3865
3866
3867
3868
3869
3870
3871
3872
3873
3874
3875
3876
3877
3878
3879
3880
3881
3882
3883
3884
3885
3886
3887
3888
3889
3890
3891
3892
3893
3894
3895
3896
3897
3898
3899
3900
3901
3902
3903
3904
3905
3906
3907
3908
3909
3910
3911
3912
3913
3914
3915
3916
3917
3918
3919
3920
3921
3922
3923
3924
3925
3926
3927
3928
3929
3930
3931
3932
3933
3934
3935
3936
3937
3938
3939
3940
3941
3942
3943
3944
3945
3946
3947
3948
3949
3950
3951
3952
3953
3954
3955
3956
3957
3958
3959
3960
3961
3962
3963
3964
3965
3966
3967
3968
3969
3970
3971
3972
3973
3974
3975
3976
3977
3978
3979
3980
3981
3982
3983
3984
3985
3986
3987
3988
3989
3990
3991
3992
3993
3994
3995
3996
3997
3998
3999
4000
4001
4002
4003
4004
4005
4006
4007
4008
4009
4010
4011
4012
4013
4014
4015
4016
4017
4018
4019
4020
4021
4022
4023
4024
4025
4026
4027
4028
4029
4030
4031
4032
4033
4034
4035
4036
4037
4038
4039
4040
4041
4042
4043
4044
4045
4046
4047
4048
4049
4050
4051
4052
4053
4054
4055
4056
4057
4058
4059
4060
4061
4062
4063
4064
4065
4066
4067
4068
4069
4070
4071
4072
4073
4074
4075
4076
4077
4078
4079
4080
4081
4082
4083
4084
4085
4086
4087
4088
4089
4090
4091
4092
4093
4094
4095
4096
4097
4098
4099
4100
4101
4102
4103
4104
4105
4106
4107
4108
4109
4110
4111
4112
4113
4114
4115
4116
4117
4118
4119
4120
4121
4122
4123
4124
4125
4126
4127
4128
4129
4130
4131
4132
4133
4134
4135
4136
4137
4138
4139
4140
4141
4142
4143
4144
4145
4146
4147
4148
4149
4150
4151
4152
4153
4154
4155
4156
4157
4158
4159
4160
4161
4162
4163
4164
4165
4166
4167
4168
4169
4170
4171
4172
4173
4174
4175
4176
4177
4178
4179
4180
4181
4182
4183
4184
4185
4186
4187
4188
4189
4190
4191
4192
4193
4194
4195
4196
4197
4198
4199
4200
4201
4202
4203
4204
4205
4206
4207
4208
4209
4210
4211
4212
4213
4214
4215
4216
4217
4218
4219
4220
4221
4222
4223
4224
4225
4226
4227
4228
4229
4230
4231
4232
4233
4234
4235
4236
4237
4238
4239
4240
4241
4242
4243
4244
4245
4246
4247
4248
4249
4250
4251
4252
4253
4254
4255
4256
4257
4258
4259
4260
4261
4262
4263
4264
4265
4266
4267
4268
4269
4270
4271
4272
4273
4274
4275
4276
4277
4278
4279
4280
4281
4282
4283
4284
4285
4286
4287
4288
4289
4290
4291
4292
4293
4294
4295
4296
4297
4298
4299
4300
4301
4302
4303
4304
4305
4306
4307
4308
4309
4310
4311
4312
4313
4314
4315
4316
4317
4318
4319
4320
4321
4322
4323
4324
4325
4326
4327
4328
4329
4330
4331
4332
4333
4334
4335
4336
4337
4338
4339
4340
4341
4342
4343
4344
4345
4346
4347
4348
4349
4350
4351
4352
4353
4354
4355
4356
4357
4358
4359
4360
4361
4362
4363
4364
4365
4366
4367
4368
4369
4370
4371
4372
4373
4374
4375
4376
4377
4378
4379
4380
4381
4382
4383
4384
4385
4386
4387
4388
4389
4390
4391
4392
4393
4394
4395
4396
4397
4398
4399
4400
4401
4402
4403
4404
4405
4406
4407
4408
4409
4410
4411
4412
4413
4414
4415
4416
4417
4418
4419
4420
4421
4422
4423
4424
4425
4426
4427
4428
4429
4430
4431
4432
4433
4434
4435
4436
4437
4438
4439
4440
4441
4442
4443
4444
4445
4446
4447
4448
4449
4450
4451
4452
4453
4454
4455
4456
4457
4458
4459
4460
4461
4462
4463
4464
4465
4466
4467
4468
4469
4470
4471
4472
4473
4474
4475
4476
4477
4478
4479
4480
4481
4482
4483
4484
4485
4486
4487
4488
4489
4490
4491
4492
4493
4494
4495
4496
4497
4498
4499
4500
4501
4502
4503
4504
4505
4506
4507
4508
4509
4510
4511
4512
4513
4514
4515
4516
4517
4518
4519
4520
4521
4522
4523
4524
4525
4526
4527
4528
4529
4530
4531
4532
4533
4534
4535
4536
4537
4538
4539
4540
4541
4542
4543
4544
4545
4546
4547
4548
4549
4550
4551
diff -urN linux-2.6.19.2.old/include/asm-cris/Kbuild linux-2.6.19.2.dev/include/asm-cris/Kbuild
--- linux-2.6.19.2.old/include/asm-cris/Kbuild	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/Kbuild	2007-02-09 16:51:34.000000000 +0100
@@ -3,3 +3,6 @@
 header-y += arch-v10/ arch-v32/
 
 unifdef-y += rs485.h
+unifdef-y += ethernet.h
+unifdef-y += etraxgpio.h
+unifdef-y += rtc.h
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v10/Kbuild linux-2.6.19.2.dev/include/asm-cris/arch-v10/Kbuild
--- linux-2.6.19.2.old/include/asm-cris/arch-v10/Kbuild	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v10/Kbuild	2007-02-26 21:03:05.000000000 +0100
@@ -1,2 +1,5 @@
 header-y += ptrace.h
 header-y += user.h
+header-y += svinto.h
+header-y += sv_addr_ag.h
+header-y += sv_addr.agh
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v10/bug.h linux-2.6.19.2.dev/include/asm-cris/arch-v10/bug.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v10/bug.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v10/bug.h	2006-06-21 10:29:16.000000000 +0200
@@ -0,0 +1,66 @@
+#ifndef __ASM_CRIS_ARCH_BUG_H
+#define __ASM_CRIS_ARCH_BUG_H
+
+#include <linux/stringify.h>
+
+#ifdef CONFIG_BUG
+#ifdef CONFIG_DEBUG_BUGVERBOSE
+/* The BUG() macro is used for marking obviously incorrect code paths.
+ * It will cause a message with the file name and line number to be printed,
+ * and then cause an oops.  The message is actually printed by handle_BUG()
+ * in arch/cris/kernel/traps.c, and the reason we use this method of storing
+ * the file name and line number is that we do not want to affect the registers
+ * by calling printk() before causing the oops.
+ */
+
+#define BUG_PREFIX 0x0D7F
+#define BUG_MAGIC  0x00001234
+
+struct bug_frame {
+	unsigned short prefix;
+	unsigned int magic;
+	unsigned short clear;
+	unsigned short movu;
+	unsigned short line;
+	unsigned short jump;
+	unsigned char* filename;
+};
+
+#if 0
+/* Unfortunately this version of the macro does not work due to a problem
+ * with the compiler (aka a bug) when compiling with -O2, which sometimes
+ * erroneously causes the second input to be stored in a register...
+ */
+#define BUG()								\
+	__asm__ __volatile__ ("clear.d [" __stringify(BUG_MAGIC) "]\n\t"\
+	                      "movu.w %0,$r0\n\t"			\
+	                      "jump %1\n\t"				\
+	                      : : "i" (__LINE__), "i" (__FILE__))
+#else
+/* This version will have to do for now, until the compiler is fixed.
+ * The drawbacks of this version are that the file name will appear multiple
+ * times in the .rodata section, and that __LINE__ and __FILE__ can probably
+ * not be used like this with newer versions of gcc.
+ */
+#define BUG()								\
+	__asm__ __volatile__ ("clear.d [" __stringify(BUG_MAGIC) "]\n\t"\
+	                      "movu.w " __stringify(__LINE__) ",$r0\n\t"\
+	                      "jump 0f\n\t"				\
+	                      ".section .rodata\n"			\
+	                      "0:\t.string \"" __FILE__ "\"\n\t"	\
+	                      ".previous")
+#endif
+
+#else
+
+/* This just causes an oops. */
+#define BUG() (*(int *)0 = 0)
+
+#endif
+
+#define HAVE_ARCH_BUG
+#endif
+
+#include <asm-generic/bug.h>
+
+#endif
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v10/ide.h linux-2.6.19.2.dev/include/asm-cris/arch-v10/ide.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v10/ide.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v10/ide.h	2005-08-23 11:44:36.000000000 +0200
@@ -32,7 +32,7 @@
 	 * together in a hwgroup, and will serialize accesses. this is good, because
 	 * we can't access more than one interface at the same time on ETRAX100.
 	 */
-	return 4;
+	return 4; 
 }
 
 static inline unsigned long ide_default_io_base(int index)
@@ -61,15 +61,15 @@
 	/* fill in ports for ATA addresses 0 to 7 */
 
 	for (i = IDE_DATA_OFFSET; i <= IDE_STATUS_OFFSET; i++) {
-		hw->io_ports[i] = data_port |
-			IO_FIELD(R_ATA_CTRL_DATA, addr, i) |
+		hw->io_ports[i] = data_port | 
+			IO_FIELD(R_ATA_CTRL_DATA, addr, i) | 
 			IO_STATE(R_ATA_CTRL_DATA, cs0, active);
 	}
 
 	/* the IDE control register is at ATA address 6, with CS1 active instead of CS0 */
 
 	hw->io_ports[IDE_CONTROL_OFFSET] = data_port |
-			IO_FIELD(R_ATA_CTRL_DATA, addr, 6) |
+			IO_FIELD(R_ATA_CTRL_DATA, addr, 6) | 
 			IO_STATE(R_ATA_CTRL_DATA, cs1, active);
 
 	/* whats this for ? */
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v10/io.h linux-2.6.19.2.dev/include/asm-cris/arch-v10/io.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v10/io.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v10/io.h	2007-03-06 12:16:16.000000000 +0100
@@ -56,6 +56,9 @@
 #define LED_RED    0x02
 #define LED_ORANGE (LED_GREEN | LED_RED)
 
+#if defined(CONFIG_ETRAX_NO_LEDS)
+#define LED_NETWORK_SET(x)
+#else
 #if CONFIG_ETRAX_LED1G == CONFIG_ETRAX_LED1R 
 #define LED_NETWORK_SET(x)                          \
 	do {                                        \
@@ -80,6 +83,7 @@
 		LED_ACTIVE_SET_R((x) & LED_RED);    \
 	} while (0)
 #endif
+#endif
 
 #ifdef CONFIG_ETRAX_PA_LEDS
 #define LED_NETWORK_SET_G(x) \
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v10/juliette.h linux-2.6.19.2.dev/include/asm-cris/arch-v10/juliette.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v10/juliette.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v10/juliette.h	2004-06-03 11:28:57.000000000 +0200
@@ -0,0 +1,328 @@
+#ifndef _ASM_JULIETTE_H
+#define _ASM_JULIETTE_H
+
+#include <asm/arch/svinto.h>
+
+/* juliette _IOC_TYPE, bits 8 to 15 in ioctl cmd */
+
+#define JULIOCTYPE 42
+
+/* supported ioctl _IOC_NR's */
+
+#define JULSTARTDMA      0x1        /* start a picture asynchronously */
+
+/* set parameters */
+
+#define SETDEFAULT        0x2 /* CCD/VIDEO/SS1M */
+#define SETPARAMETERS     0x3 /* CCD/VIDEO      */
+#define SETSIZE           0x4 /* CCD/VIDEO/SS1M */
+#define SETCOMPRESSION    0x5 /* CCD/VIDEO/SS1M */
+#define SETCOLORLEVEL     0x6 /* CCD/VIDEO      */
+#define SETBRIGHTNESS     0x7 /* CCD            */
+#define SETROTATION       0x8 /* CCD            */
+#define SETTEXT           0x9 /* CCD/VIDEO/SS1M */
+#define SETCLOCK          0xa /* CCD/VIDEO/SS1M */
+#define SETDATE           0xb /* CCD/VIDEO/SS1M */
+#define SETTIMEFORMAT     0xc /* CCD/VIDEO/SS1M */
+#define SETDATEFORMAT     0xd /*     VIDEO      */
+#define SETTEXTALIGNMENT  0xe /*     VIDEO      */
+#define SETFPS            0xf /* CCD/VIDEO/SS1M */
+#define SETVGA           0xff /*     VIDEO      */
+#define SETCOMMENT       0xfe /* CCD/VIDEO      */
+
+/* get parameters */
+
+#define GETDRIVERTYPE    0x10 /* CCD/VIDEO/SS1M */
+#define GETNBROFCAMERAS  0x11 /* CCD/VIDEO/SS1M */
+#define GETPARAMETERS    0x12 /* CCD/VIDEO/SS1M */
+#define GETBUFFERSIZE    0x13 /* CCD/VIDEO/SS1M */
+#define GETVIDEOTYPE     0x14 /*     VIDEO/SS1M */
+#define GETVIDEOSIGNAL   0x15 /*     VIDEO      */
+#define GETMODULATION    0x16 /*     VIDEO      */
+#define GETDCYVALUES     0xa0 /* CCD      /SS1M */
+#define GETDCYWIDTH      0xa1 /* CCD      /SS1M */
+#define GETDCYHEIGHT     0xa2 /* CCD      /SS1M */
+#define GETSIZE          0xa3 /* CCD/VIDEO      */
+#define GETCOMPRESSION   0xa4 /* CCD/VIDEO      */
+
+/* detect and get parameters */
+
+#define DETECTMODULATION  0x17 /*     VIDEO      */
+#define DETECTVIDEOTYPE   0x18 /*     VIDEO      */
+#define DETECTVIDEOSIGNAL 0x19 /*     VIDEO      */
+
+/* configure default parameters */
+
+#define CONFIGUREDEFAULT  0x20 /* CCD/VIDEO/SS1M */
+#define DEFSIZE           0x21 /* CCD/VIDEO/SS1M */
+#define DEFCOMPRESSION    0x22 /* CCD/VIDEO/SS1M */
+#define DEFCOLORLEVEL     0x23 /* CCD/VIDEO      */
+#define DEFBRIGHTNESS     0x24 /* CCD            */
+#define DEFROTATION       0x25 /* CCD            */
+#define DEFWHITEBALANCE   0x26 /* CCD            */
+#define DEFEXPOSURE       0x27 /* CCD            */
+#define DEFAUTOEXPWINDOW  0x28 /* CCD            */
+#define DEFTEXT           0x29 /* CCD/VIDEO/SS1M */
+#define DEFCLOCK          0x2a /* CCD/VIDEO/SS1M */
+#define DEFDATE           0x2b /* CCD/VIDEO/SS1M */
+#define DEFTIMEFORMAT     0x2c /* CCD/VIDEO/SS1M */
+#define DEFDATEFORMAT     0x2d /*     VIDEO      */
+#define DEFTEXTALIGNMENT  0x2e /*     VIDEO      */
+#define DEFFPS            0x2f /* CCD/VIDEO/SS1M */
+#define DEFTEXTSTRING     0x30 /* CCD/VIDEO/SS1M */
+#define DEFHEADERINFO     0x31 /* CCD/VIDEO/SS1M */
+#define DEFWEXAR          0x32 /* CCD            */
+#define DEFLINEDELAY      0x33 /* CCD            */
+#define DEFDISABLEDVIDEO  0x34 /*     VIDEO      */
+#define DEFVIDEOTYPE      0x35 /*     VIDEO      */
+#define DEFMODULATION     0x36 /*     VIDEO      */
+#define DEFXOFFSET        0x37 /*     VIDEO      */
+#define DEFYOFFSET        0x38 /*     VIDEO      */
+#define DEFYCMODE         0x39 /*     VIDEO      */
+#define DEFVCRMODE        0x3a /*     VIDEO      */
+#define DEFSTOREDCYVALUES 0x3b /* CCD/VIDEO/SS1M */
+#define DEFWCDS           0x3c /* CCD            */
+#define DEFVGA            0x3d /*     VIDEO      */
+#define DEFCOMMENT        0x3e /* CCD/VIDEO      */
+#define DEFCOMMENTSIZE    0x3f /* CCD/VIDEO      */
+#define DEFCOMMENTTEXT    0x50 /* CCD/VIDEO      */
+#define DEFSTOREDCYTEXT   0x51 /*     VIDEO      */
+
+
+#define JULABORTDMA       0x70 /* Abort current DMA transfer */
+
+/* juliette general i/o port */
+
+#define JIO_READBITS      0x40 /* read and return current port bits */
+#define JIO_SETBITS       0x41 /* set bits marked by 1 in the argument */
+#define JIO_CLRBITS       0x42 /* clr bits marked by 1 in the argument */
+#define JIO_READDIR       0x43 /* read direction, 0=input 1=output */
+#define JIO_SETINPUT      0x44 /* set direction, 0=unchanged 1=input
+                                  returns current dir */
+#define JIO_SETOUTPUT     0x45 /* set direction, 0=unchanged 1=output
+                                  returns current dir */
+
+/**** YumYum internal adresses ****/
+
+/* Juliette buffer addresses */
+
+#define BUFFER1_VIDEO   0x1100
+#define BUFFER2_VIDEO   0x2800
+#define ACDC_BUFF_VIDEO 0x0aaa
+#define BUFFER1         0x1700
+#define BUFFER2         0x2b01
+#define ACDC_BUFFER     0x1200
+#define BUFFER1_SS1M    0x1100
+#define BUFFER2_SS1M    0x2800
+#define ACDC_BUFF_SS1M  0x0900
+
+/* Juliette parameter memory addresses */
+
+#define PA_BUFFER_CNT     0x3f09 /* CCD/VIDEO */
+#define PA_CCD_BUFFER     0x3f10 /* CCD       */
+#define PA_VIDEO_BUFFER   0x3f10 /*     VIDEO */
+#define PA_DCT_BUFFER     0x3f11 /* CCD/VIDEO */
+#define PA_TEMP           0x3f12 /* CCD/VIDEO */
+#define PA_VIDEOLINE_RD   0x3f13 /*     VIDEO */
+#define PA_VIDEOLINE_WR   0x3f14 /*     VIDEO */
+#define PA_VI_HDELAY0     0x3f15 /*     VIDEO */
+#define PA_VI_VDELAY0     0x3f16 /*     VIDEO */
+#define PA_VI_HDELAY1     0x3f17 /*     VIDEO */
+#define PA_VI_VDELAY1     0x3f18 /*     VIDEO */
+#define PA_VI_HDELAY2     0x3f19 /*     VIDEO */
+#define PA_VI_VDELAY2     0x3f1a /*     VIDEO */
+#define PA_VI_HDELAY3     0x3f1b /*     VIDEO */
+#define PA_VI_VDELAY3     0x3f1c /*     VIDEO */
+#define PA_VI_CTRL        0x3f20 /*     VIDEO */
+#define PA_JPEG_CTRL      0x3f22 /* CCD/VIDEO */
+#define PA_BUFFER_SIZE    0x3f24 /* CCD/VIDEO */
+#define PA_PAL_NTSC       0x3f25 /*     VIDEO */
+#define PA_MACROBLOCKS    0x3f26 /* CCD/VIDEO */
+#define PA_COLOR          0x3f27 /*     VIDEO */
+#define PA_MEMCH1CNT2     0x3f28 /* CCD/VIDEO */
+#define PA_MEMCH1CNT3     0x3f29 /*     VIDEO */
+#define PA_MEMCH1STR2     0x3f2a /* CCD/VIDEO */
+#define PA_MEMCH1STR3     0x3f2b /*     VIDEO */
+#define PA_BUFFERS        0x3f2c /* CCD/VIDEO */
+#define PA_PROGRAM        0x3f2d /* CCD/VIDEO */
+#define PA_ROTATION       0x3f2e /* CCD       */
+#define PA_PC             0x3f30 /* CCD/VIDEO */
+#define PA_PC2            0x3f31 /*     VIDEO */
+#define PA_ODD_LINE       0x3f32 /*     VIDEO */
+#define PA_EXP_DELAY      0x3f34 /* CCD       */
+#define PA_MACROBLOCK_CNT 0x3f35 /* CCD/VIDEO */
+#define PA_DRAM_PTR1_L    0x3f36 /* CCD/VIDEO */
+#define PA_CLPOB_CNT      0x3f37 /* CCD       */
+#define PA_DRAM_PTR1_H    0x3f38 /* CCD/VIDEO */
+#define PA_DRAM_PTR2_L    0x3f3a /*     VIDEO */
+#define PA_DRAM_PTR2_H    0x3f3c /*     VIDEO */
+#define PA_CCD_LINE_CNT   0x3f3f /* CCD       */
+#define PA_VIDEO_LINE_CNT 0x3f3f /*     VIDEO */
+#define PA_TEXT           0x3f41 /* CCD/VIDEO */
+#define PA_CAMERA_CHANGED 0x3f42 /*     VIDEO */
+#define PA_TEXTALIGNMENT  0x3f43 /*     VIDEO */
+#define PA_DISABLED       0x3f44 /*     VIDEO */
+#define PA_MACROBLOCKTEXT 0x3f45 /*     VIDEO */
+#define PA_VGA            0x3f46 /*     VIDEO */
+#define PA_ZERO           0x3ffe /*     VIDEO */
+#define PA_NULL           0x3fff /* CCD/VIDEO */
+
+typedef enum {
+	jpeg  = 0, 
+	dummy = 1
+} request_type;
+
+typedef enum {
+	hugesize  = 0,
+	fullsize  = 1,
+	halfsize  = 2,
+	fieldsize = 3
+} size_type;
+  
+typedef enum { 
+	min       = 0,
+	low       = 1,
+	medium    = 2,
+	high      = 3,
+	very_high = 4,
+	very_low  = 5,
+	q1        = 6,
+	q2        = 7,
+	q3        = 8,
+	q4        = 9,
+	q5        = 10,
+	q6        = 11
+} compr_type;
+
+typedef enum { 
+	deg_0   = 0,
+	deg_180 = 1,
+	deg_90  = 2,
+	deg_270 = 3
+} rotation_type;
+
+typedef enum { 
+	auto_white    = 0,
+	hold          = 1,
+	fixed_outdoor = 2,
+	fixed_indoor  = 3,
+	fixed_fluor   = 4
+} white_balance_type;
+
+typedef enum { 
+	auto_exp  = 0,
+	fixed_exp = 1
+} exposure_type;
+
+typedef enum { 
+	no_window = 0,
+	center    = 1,
+	top       = 2,
+	lower     = 3,
+	left      = 4,
+	right     = 5,
+	spot      = 6,
+	cw        = 7
+} exp_window_type;
+
+typedef enum {
+	h_24 = 0,
+	h_12 = 1,
+	h_24P = 2
+} hour_type;
+
+typedef enum {
+	standard = 0,
+	YYYY_MM_DD = 1,
+	Www_Mmm_DD_YYYY = 2,
+	Www_DD_MM_YYYY = 3
+} date_type;
+
+typedef enum {
+	left_align = 0,
+	center_align = 1,
+	right_align = 2
+} alignment_type;
+
+typedef enum { 
+	off = 0,
+	on  = 1,
+	no  = 0,
+	yes = 1
+} enable_type;
+
+typedef enum {
+         disabled = 0,
+         enabled  = 1,
+         extended = 2
+} comment_type;
+
+typedef enum {
+	pal  = 0,
+	ntsc = 1
+} video_type;
+
+typedef enum {
+	pal_bghi_ntsc_m              = 0,
+	ntsc_4_43_50hz_pal_4_43_60hz = 1,
+	pal_n_ntsc_4_43_60hz         = 2,
+	ntsc_n_pal_m                 = 3,
+	secam_pal_4_43_60hz          = 4
+} modulation_type;
+
+typedef enum {
+	cam0 = 0,
+	cam1 = 1,
+	cam2 = 2,
+	cam3 = 3,
+	quad = 32
+} camera_type;
+
+typedef enum {
+	video_driver = 0,
+	ccd_driver   = 1
+} driver_type;
+
+struct jul_param {
+	request_type req_type;
+	size_type size;
+	compr_type compression;
+	rotation_type rotation;
+	int color_level;
+	int brightness;
+	white_balance_type white_balance;
+	exposure_type exposure;
+        exp_window_type auto_exp_window;
+	hour_type time_format;
+	date_type date_format;
+	alignment_type text_alignment;
+	enable_type text;
+	enable_type clock;
+	enable_type date;
+	enable_type fps;
+        enable_type vga;
+        enable_type comment;
+};
+
+struct video_param {
+	enable_type disabled;
+	modulation_type modulation;
+	video_type video;
+	enable_type signal;
+	enable_type vcr;
+	int xoffset;
+	int yoffset;
+};
+
+/* The juliette_request structure is used during the JULSTARTDMA asynchronous
+ * picture-taking ioctl call as an argument to specify a buffer which will get
+ * the final picture.
+ */
+
+struct juliette_request {
+	char *buf;              /* Pointer to the buffer to hold picture data */
+	unsigned int buflen;    /* Length of the above buffer */
+	unsigned int size;      /* Resulting length, 0 if the picture is not ready */
+};
+
+#endif
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/Kbuild linux-2.6.19.2.dev/include/asm-cris/arch-v32/Kbuild
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/Kbuild	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/Kbuild	2007-02-09 16:51:34.000000000 +0100
@@ -1,2 +1,3 @@
 header-y += ptrace.h
 header-y += user.h
+header-y += cryptocop.h
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/arbiter.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/arbiter.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/arbiter.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/arbiter.h	2006-10-13 14:45:18.000000000 +0200
@@ -22,6 +22,7 @@
 
 int crisv32_arbiter_allocate_bandwidth(int client, int region,
 				       unsigned long bandwidth);
+void crisv32_arbiter_deallocate_bandwidth(int client, int region);
 int crisv32_arbiter_watch(unsigned long start, unsigned long size,
                           unsigned long clients, unsigned long accesses,
                           watch_callback* cb);
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/bitops.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/bitops.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/bitops.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/bitops.h	2005-08-23 11:44:37.000000000 +0200
@@ -16,7 +16,7 @@
 	__asm__ __volatile__ ("swapnwbr %0\n\t"
 			      "lz %0,%0"
 			      : "=r" (res) : "0" (w));
-
+	
 	return res;
 }
 
@@ -28,7 +28,7 @@
 	__asm__ __volatile__ ("swapwbr %0\n\t"
 			      "lz %0,%0"
 			      : "=r" (res) : "0" (w));
-
+	
 	return res;
 }
 
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/board.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/board.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/board.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/board.h	2007-01-29 15:05:01.000000000 +0100
@@ -0,0 +1,74 @@
+/*
+ * linux/include/asm-cris/arch-v32/board.h
+ *
+ * Types for board-specific data.
+ *
+ * Copyright (C) 2007  Axis Communications AB
+ */
+
+#ifndef __ARCH_V32_BOARD_H
+#define __ARCH_V32_BOARD_H
+
+/* A tuple for a regi base and an interrupt.  */
+struct crisv32_regi_n_int {
+	u32 regi;
+	u32 irq;
+};
+
+/*
+ * SPI and SD/MMC types, arranged such that the data for mmc_spi is an
+ * add-on to SPI; the SPI data does not contain anything about SD/MMC
+ * and the SPI controller driver can't access it.  SPI data is
+ * arranged to allow sharing common functions between SSER and GPIO.
+ */
+
+/* Hardware identification for the bitbanged GPIO SPI controller.  */
+struct crisv32_spi_gpio_controller_data {
+	/* Names of the pins.  */
+	const char *cs;
+	const char *miso;
+	const char *mosi;
+	const char *sclk;
+};
+
+/* Similar for the SSER SPI controller.  */
+struct crisv32_spi_sser_controller_data {
+	/* How to connect pins and claim the SSER interface and the DMA
+	   channels.  */
+	int (*iface_allocate)(struct crisv32_regi_n_int *sser,
+			      struct crisv32_regi_n_int *dmain,
+			      struct crisv32_regi_n_int *dmaout);
+	void (*iface_free)(void);
+
+	/* Whether DMA is to be used.  */
+	int using_dma;
+};
+
+struct crisv32_mmc_spi_pinstate;
+
+/*
+ * Regardless of SPI controller, these pins are needed in addition to
+ * the SPI pins when the used as a SD/MMC SPI controller.
+ */
+struct crisv32_mmc_spi_pindata {
+	/* Names of the pins.  */
+	const char *card_detect;
+	const char *write_protect;
+
+	/* Related private state to interface to the mmc_spi API. */
+	struct crisv32_mmc_spi_pinstate *pinstate;
+};
+
+/* When SD/MMC SPI on GPIO, here's all the hardware-identifying data.  */
+struct crisv32_mmc_spi_gpio_hwdata {
+	struct crisv32_spi_gpio_controller_data spi;
+	struct crisv32_mmc_spi_pindata mmc;
+};
+
+/* Similar for SSER.  */
+struct crisv32_mmc_spi_sser_hwdata {
+	struct crisv32_spi_sser_controller_data spi;
+	struct crisv32_mmc_spi_pindata mmc;
+};
+
+#endif /* __ARCH_V32_BOARD_H */
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/bug.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/bug.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/bug.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/bug.h	2006-06-21 10:29:16.000000000 +0200
@@ -0,0 +1,69 @@
+#ifndef __ASM_CRIS_ARCH_BUG_H
+#define __ASM_CRIS_ARCH_BUG_H
+
+#include <linux/stringify.h>
+
+#ifdef CONFIG_BUG
+#ifdef CONFIG_DEBUG_BUGVERBOSE
+/* The BUG() macro is used for marking obviously incorrect code paths.
+ * It will cause a message with the file name and line number to be printed,
+ * and then cause an oops.  The message is actually printed by handle_BUG()
+ * in arch/cris/kernel/traps.c, and the reason we use this method of storing
+ * the file name and line number is that we do not want to affect the registers
+ * by calling printk() before causing the oops (this is not entirely true
+ * for CRISv32 since we need to modify the $acr register).
+ */
+
+#define BUG_PREFIX 0xFE6F
+#define BUG_MAGIC  0x00001234
+
+struct bug_frame {
+	unsigned short prefix;
+	unsigned int magic;
+	unsigned short clear;
+	unsigned short movu;
+	unsigned short line;
+	unsigned short jump;
+	unsigned char* filename;
+};
+
+#if 0
+/* Unfortunately this version of the macro does not work due to a problem
+ * with the compiler (aka a bug) when compiling with -O2, which sometimes
+ * erroneously causes the second input to be stored in a register...
+ */
+#define BUG() \
+	__asm__ __volatile__ ("move.d [" __stringify(BUG_MAGIC) "],$acr\n\t"\
+	                      "clear.d [$acr]\n\t"			\
+	                      "movu.w %0,$r0\n\t"			\
+	                      "jump %1\n\t"				\
+	                      : : "i" (__LINE__), "i" (__FILE__))
+#else
+/* This version will have to do for now, until the compiler is fixed.
+ * The drawbacks of this version are that the file name will appear multiple
+ * times in the .rodata section, and that __LINE__ and __FILE__ can probably
+ * not be used like this with newer versions of gcc.
+ */
+#define BUG()								\
+	__asm__ __volatile__ ("move.d " __stringify(BUG_MAGIC) ",$acr\n\t"\
+	                      "clear.d [$acr]\n\t"			\
+	                      "movu.w " __stringify(__LINE__) ",$r0\n\t"\
+	                      "jump 0f\n\t"				\
+	                      ".section .rodata\n"			\
+	                      "0:\t.string \"" __FILE__ "\"\n\t"	\
+	                      ".previous")
+#endif
+
+#else
+
+/* This just causes an oops. */
+#define BUG() (*(int *)0 = 0)
+
+#endif
+
+#define HAVE_ARCH_BUG
+#endif
+
+#include <asm-generic/bug.h>
+
+#endif
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/cache.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/cache.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/cache.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/cache.h	2007-01-05 09:59:53.000000000 +0100
@@ -1,8 +1,19 @@
 #ifndef _ASM_CRIS_ARCH_CACHE_H
 #define _ASM_CRIS_ARCH_CACHE_H
 
+#include <asm/arch/hwregs/dma.h>
+
 /* A cache-line is 32 bytes. */
 #define L1_CACHE_BYTES 32
 #define L1_CACHE_SHIFT 5
 
+void flush_dma_list(dma_descr_data* descr);
+void flush_dma_descr(dma_descr_data* descr, int flush_buf);
+
+#define flush_dma_context(c) \
+  flush_dma_list(phys_to_virt((c)->saved_data));
+
+void cris_flush_cache_range(void* buf, unsigned long len);
+void cris_flush_cache(void);
+
 #endif /* _ASM_CRIS_ARCH_CACHE_H */
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/cryptocop.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/cryptocop.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/cryptocop.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/cryptocop.h	2005-04-20 14:33:25.000000000 +0200
@@ -160,7 +160,7 @@
 	cryptocop_source_dma = 0,
 	cryptocop_source_des,
 	cryptocop_source_3des,
-	cryptocop_source_aes,
+	cryptocop_source_aes,	
 	cryptocop_source_md5,
 	cryptocop_source_sha1,
 	cryptocop_source_csum,
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/delay.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/delay.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/delay.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/delay.h	2006-10-11 19:46:19.000000000 +0200
@@ -1,6 +1,16 @@
 #ifndef _ASM_CRIS_ARCH_DELAY_H
 #define _ASM_CRIS_ARCH_DELAY_H
 
+extern void cris_delay10ns(u32 n10ns);
+#define udelay(u) cris_delay10ns((u)*100)
+#define ndelay(n) cris_delay10ns(((n)+9)/10)
+
+/*
+ * Not used anymore for udelay or ndelay.  Referenced by
+ * e.g. init/calibrate.c.  All other references are likely bugs;
+ * should be replaced by mdelay, udelay or ndelay.
+ */
+
 static inline void
 __delay(int loops)
 {
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/dma.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/dma.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/dma.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/dma.h	2005-05-02 12:43:02.000000000 +0200
@@ -67,7 +67,7 @@
   dma_ext3
 };
 
-int crisv32_request_dma(unsigned int dmanr, const char * device_id,
+int crisv32_request_dma(unsigned int dmanr, const char * device_id, 
                         unsigned options, unsigned bandwidth, enum dma_owner owner);
 void crisv32_free_dma(unsigned int dmanr);
 
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/Makefile linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/Makefile
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/Makefile	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/Makefile	2004-01-07 22:16:18.000000000 +0100
@@ -126,9 +126,9 @@
 
 # From /n/asic/projects/guinness/design/
 reg_map.h: $(DESIGNDIR)/top/rtl/global.rmap $(DESIGNDIR)/top/mod/modreg.rmap
-	$(RDES2C) -base 0xb0000000 $^
+	$(RDES2C) -base 0xb0000000 $^ 
 reg_map_asm.h: $(DESIGNDIR)/top/rtl/global.rmap $(DESIGNDIR)/top/mod/modreg.rmap
-	$(RDES2C) -base 0xb0000000 -asm -outfile $@ $^
+	$(RDES2C) -base 0xb0000000 -asm -outfile $@ $^  
 
 reg_rdwr.h: $(DESIGNDIR)/top/sw/include/reg_rdwr.h
 	cat $< | sed -e 's/\$$Id\:/id\:/g' >$@
@@ -171,14 +171,14 @@
 	done
 
 .PHONY: axw
-## %.axw  - Generate the specified .axw file (doesn't work for all files
+## %.axw  - Generate the specified .axw file (doesn't work for all files 
 ##          due to inconsistent naming ir .r files.
 %.axw: axw
 	@for RDES in $(REGDESC); do \
 		if echo "$$RDES" | grep $* ; then \
 		  $(RDES2TXT) $$RDES; \
 		fi \
-	done
+	done	
 
 .PHONY: clean
 ## clean  - Remove .h files and .axw files.
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/ata_defs_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/ata_defs_asm.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/ata_defs_asm.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/ata_defs_asm.h	2005-04-24 20:31:04.000000000 +0200
@@ -4,9 +4,9 @@
 /*
  * This file is autogenerated from
  *   file:           ../../inst/ata/rtl/ata_regs.r
- *     id:           ata_regs.r,v 1.11 2005/02/09 08:27:36 kriskn Exp
+ *     id:           ata_regs.r,v 1.11 2005/02/09 08:27:36 kriskn Exp 
  *     last modfied: Mon Apr 11 16:06:25 2005
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/ata_defs_asm.h ../../inst/ata/rtl/ata_regs.r
  *      id: $Id: ata_defs_asm.h,v 1.1 2005/04/24 18:31:04 starvik Exp $
  * Any changes here will be lost.
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/bif_core_defs_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/bif_core_defs_asm.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/bif_core_defs_asm.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/bif_core_defs_asm.h	2005-04-24 20:31:04.000000000 +0200
@@ -4,9 +4,9 @@
 /*
  * This file is autogenerated from
  *   file:           ../../inst/bif/rtl/bif_core_regs.r
- *     id:           bif_core_regs.r,v 1.17 2005/02/04 13:28:22 np Exp
+ *     id:           bif_core_regs.r,v 1.17 2005/02/04 13:28:22 np Exp 
  *     last modfied: Mon Apr 11 16:06:33 2005
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/bif_core_defs_asm.h ../../inst/bif/rtl/bif_core_regs.r
  *      id: $Id: bif_core_defs_asm.h,v 1.1 2005/04/24 18:31:04 starvik Exp $
  * Any changes here will be lost.
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/bif_dma_defs_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/bif_dma_defs_asm.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/bif_dma_defs_asm.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/bif_dma_defs_asm.h	2005-04-24 20:31:04.000000000 +0200
@@ -4,9 +4,9 @@
 /*
  * This file is autogenerated from
  *   file:           ../../inst/bif/rtl/bif_dma_regs.r
- *     id:           bif_dma_regs.r,v 1.6 2005/02/04 13:28:31 perz Exp
+ *     id:           bif_dma_regs.r,v 1.6 2005/02/04 13:28:31 perz Exp 
  *     last modfied: Mon Apr 11 16:06:33 2005
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/bif_dma_defs_asm.h ../../inst/bif/rtl/bif_dma_regs.r
  *      id: $Id: bif_dma_defs_asm.h,v 1.1 2005/04/24 18:31:04 starvik Exp $
  * Any changes here will be lost.
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/bif_slave_defs_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/bif_slave_defs_asm.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/bif_slave_defs_asm.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/bif_slave_defs_asm.h	2005-04-24 20:31:04.000000000 +0200
@@ -4,9 +4,9 @@
 /*
  * This file is autogenerated from
  *   file:           ../../inst/bif/rtl/bif_slave_regs.r
- *     id:           bif_slave_regs.r,v 1.5 2005/02/04 13:55:28 perz Exp
+ *     id:           bif_slave_regs.r,v 1.5 2005/02/04 13:55:28 perz Exp 
  *     last modfied: Mon Apr 11 16:06:34 2005
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/bif_slave_defs_asm.h ../../inst/bif/rtl/bif_slave_regs.r
  *      id: $Id: bif_slave_defs_asm.h,v 1.1 2005/04/24 18:31:04 starvik Exp $
  * Any changes here will be lost.
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/config_defs_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/config_defs_asm.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/config_defs_asm.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/config_defs_asm.h	2005-04-24 20:31:04.000000000 +0200
@@ -4,9 +4,9 @@
 /*
  * This file is autogenerated from
  *   file:           ../../rtl/config_regs.r
- *     id:           config_regs.r,v 1.23 2004/03/04 11:34:42 mikaeln Exp
+ *     id:           config_regs.r,v 1.23 2004/03/04 11:34:42 mikaeln Exp 
  *     last modfied: Thu Mar  4 12:34:39 2004
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/config_defs_asm.h ../../rtl/config_regs.r
  *      id: $Id: config_defs_asm.h,v 1.1 2005/04/24 18:31:04 starvik Exp $
  * Any changes here will be lost.
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/cpu_vect.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/cpu_vect.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/cpu_vect.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/cpu_vect.h	2005-04-24 20:31:04.000000000 +0200
@@ -3,7 +3,7 @@
 version . */
 
 #ifndef _______INST_CRISP_DOC_CPU_VECT_R
-#define _______INST_CRISP_DOC_CPU_VECT_R
+#define _______INST_CRISP_DOC_CPU_VECT_R 
 #define NMI_INTR_VECT	0x00
 #define RESERVED_1_INTR_VECT	0x01
 #define RESERVED_2_INTR_VECT	0x02
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/cris_defs_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/cris_defs_asm.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/cris_defs_asm.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/cris_defs_asm.h	2005-04-24 20:31:04.000000000 +0200
@@ -4,9 +4,9 @@
 /*
  * This file is autogenerated from
  *   file:           ../../inst/crisp/doc/cris.r
- *     id:           cris.r,v 1.6 2004/05/05 07:41:12 perz Exp
+ *     id:           cris.r,v 1.6 2004/05/05 07:41:12 perz Exp 
  *     last modfied: Mon Apr 11 16:06:39 2005
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/cris_defs_asm.h ../../inst/crisp/doc/cris.r
  *      id: $Id: cris_defs_asm.h,v 1.1 2005/04/24 18:31:04 starvik Exp $
  * Any changes here will be lost.
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/dma_defs_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/dma_defs_asm.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/dma_defs_asm.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/dma_defs_asm.h	2005-04-24 20:31:04.000000000 +0200
@@ -4,9 +4,9 @@
 /*
  * This file is autogenerated from
  *   file:           ../../inst/dma/inst/dma_common/rtl/dma_regdes.r
- *     id:           dma_regdes.r,v 1.39 2005/02/10 14:07:23 janb Exp
+ *     id:           dma_regdes.r,v 1.39 2005/02/10 14:07:23 janb Exp 
  *     last modfied: Mon Apr 11 16:06:51 2005
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/dma_defs_asm.h ../../inst/dma/inst/dma_common/rtl/dma_regdes.r
  *      id: $Id: dma_defs_asm.h,v 1.1 2005/04/24 18:31:04 starvik Exp $
  * Any changes here will be lost.
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/eth_defs_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/eth_defs_asm.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/eth_defs_asm.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/eth_defs_asm.h	2005-04-24 20:31:04.000000000 +0200
@@ -4,9 +4,9 @@
 /*
  * This file is autogenerated from
  *   file:           ../../inst/eth/rtl/eth_regs.r
- *     id:           eth_regs.r,v 1.11 2005/02/09 10:48:38 kriskn Exp
+ *     id:           eth_regs.r,v 1.11 2005/02/09 10:48:38 kriskn Exp 
  *     last modfied: Mon Apr 11 16:07:03 2005
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/eth_defs_asm.h ../../inst/eth/rtl/eth_regs.r
  *      id: $Id: eth_defs_asm.h,v 1.1 2005/04/24 18:31:04 starvik Exp $
  * Any changes here will be lost.
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/gio_defs_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/gio_defs_asm.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/gio_defs_asm.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/gio_defs_asm.h	2005-04-24 20:31:04.000000000 +0200
@@ -4,9 +4,9 @@
 /*
  * This file is autogenerated from
  *   file:           ../../inst/gio/rtl/gio_regs.r
- *     id:           gio_regs.r,v 1.5 2005/02/04 09:43:21 perz Exp
+ *     id:           gio_regs.r,v 1.5 2005/02/04 09:43:21 perz Exp 
  *     last modfied: Mon Apr 11 16:07:47 2005
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/gio_defs_asm.h ../../inst/gio/rtl/gio_regs.r
  *      id: $Id: gio_defs_asm.h,v 1.1 2005/04/24 18:31:04 starvik Exp $
  * Any changes here will be lost.
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/intr_vect.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/intr_vect.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/intr_vect.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/intr_vect.h	2005-04-24 20:31:04.000000000 +0200
@@ -3,7 +3,7 @@
 version . */
 
 #ifndef _______INST_INTR_VECT_RTL_GUINNESS_IVMASK_CONFIG_R
-#define _______INST_INTR_VECT_RTL_GUINNESS_IVMASK_CONFIG_R
+#define _______INST_INTR_VECT_RTL_GUINNESS_IVMASK_CONFIG_R 
 #define MEMARB_INTR_VECT	0x31
 #define GEN_IO_INTR_VECT	0x32
 #define IOP0_INTR_VECT	0x33
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/intr_vect_defs_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/intr_vect_defs_asm.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/intr_vect_defs_asm.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/intr_vect_defs_asm.h	2005-04-24 20:31:04.000000000 +0200
@@ -4,9 +4,9 @@
 /*
  * This file is autogenerated from
  *   file:           ../../inst/intr_vect/rtl/guinness/ivmask.config.r
- *     id:           ivmask.config.r,v 1.4 2005/02/15 16:05:38 stefans Exp
+ *     id:           ivmask.config.r,v 1.4 2005/02/15 16:05:38 stefans Exp 
  *     last modfied: Mon Apr 11 16:08:03 2005
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/intr_vect_defs_asm.h ../../inst/intr_vect/rtl/guinness/ivmask.config.r
  *      id: $Id: intr_vect_defs_asm.h,v 1.1 2005/04/24 18:31:04 starvik Exp $
  * Any changes here will be lost.
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/irq_nmi_defs_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/irq_nmi_defs_asm.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/irq_nmi_defs_asm.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/irq_nmi_defs_asm.h	2005-04-24 20:31:04.000000000 +0200
@@ -6,7 +6,7 @@
  *   file:           ../../mod/irq_nmi.r
  *     id:           <not found>
  *     last modfied: Thu Jan 22 09:22:43 2004
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/irq_nmi_defs_asm.h ../../mod/irq_nmi.r
  *      id: $Id: irq_nmi_defs_asm.h,v 1.1 2005/04/24 18:31:04 starvik Exp $
  * Any changes here will be lost.
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/marb_defs_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/marb_defs_asm.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/marb_defs_asm.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/marb_defs_asm.h	2005-04-24 20:31:04.000000000 +0200
@@ -6,7 +6,7 @@
  *   file:           ../../inst/memarb/rtl/guinness/marb_top.r
  *     id:           <not found>
  *     last modfied: Mon Apr 11 16:12:16 2005
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/marb_defs_asm.h ../../inst/memarb/rtl/guinness/marb_top.r
  *      id: $Id: marb_defs_asm.h,v 1.1 2005/04/24 18:31:04 starvik Exp $
  * Any changes here will be lost.
@@ -313,7 +313,7 @@
  *   file:           ../../inst/memarb/rtl/guinness/marb_top.r
  *     id:           <not found>
  *     last modfied: Mon Apr 11 16:12:16 2005
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/marb_defs_asm.h ../../inst/memarb/rtl/guinness/marb_top.r
  *      id: $Id: marb_defs_asm.h,v 1.1 2005/04/24 18:31:04 starvik Exp $
  * Any changes here will be lost.
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/mmu_defs_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/mmu_defs_asm.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/mmu_defs_asm.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/mmu_defs_asm.h	2005-04-24 20:31:04.000000000 +0200
@@ -4,9 +4,9 @@
 /*
  * This file is autogenerated from
  *   file:           ../../inst/mmu/doc/mmu_regs.r
- *     id:           mmu_regs.r,v 1.12 2004/05/06 13:48:45 mikaeln Exp
+ *     id:           mmu_regs.r,v 1.12 2004/05/06 13:48:45 mikaeln Exp 
  *     last modfied: Mon Apr 11 17:03:20 2005
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/mmu_defs_asm.h ../../inst/mmu/doc/mmu_regs.r
  *      id: $Id: mmu_defs_asm.h,v 1.1 2005/04/24 18:31:04 starvik Exp $
  * Any changes here will be lost.
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/pinmux_defs_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/pinmux_defs_asm.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/pinmux_defs_asm.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/pinmux_defs_asm.h	2005-04-24 20:31:04.000000000 +0200
@@ -4,9 +4,9 @@
 /*
  * This file is autogenerated from
  *   file:           ../../inst/pinmux/rtl/guinness/pinmux_regs.r
- *     id:           pinmux_regs.r,v 1.40 2005/02/09 16:22:59 perz Exp
+ *     id:           pinmux_regs.r,v 1.40 2005/02/09 16:22:59 perz Exp 
  *     last modfied: Mon Apr 11 16:09:11 2005
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/pinmux_defs_asm.h ../../inst/pinmux/rtl/guinness/pinmux_regs.r
  *      id: $Id: pinmux_defs_asm.h,v 1.1 2005/04/24 18:31:04 starvik Exp $
  * Any changes here will be lost.
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/reg_map_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/reg_map_asm.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/reg_map_asm.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/reg_map_asm.h	2005-04-24 20:31:04.000000000 +0200
@@ -4,17 +4,17 @@
 /*
  * This file is autogenerated from
  *   file:            ../../mod/fakereg.rmap
- *     id:            fakereg.rmap,v 1.3 2004/02/11 19:53:22 ronny Exp
+ *     id:            fakereg.rmap,v 1.3 2004/02/11 19:53:22 ronny Exp 
  *     last modified: Wed Feb 11 20:53:25 2004
  *   file:            ../../rtl/global.rmap
- *     id:            global.rmap,v 1.3 2003/08/18 15:08:23 mikaeln Exp
+ *     id:            global.rmap,v 1.3 2003/08/18 15:08:23 mikaeln Exp 
  *     last modified: Mon Aug 18 17:08:23 2003
  *   file:            ../../mod/modreg.rmap
- *     id:            modreg.rmap,v 1.31 2004/02/20 15:40:04 stefans Exp
+ *     id:            modreg.rmap,v 1.31 2004/02/20 15:40:04 stefans Exp 
  *     last modified: Fri Feb 20 16:40:04 2004
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/reg_map_asm.h -base 0xb0000000 ../../rtl/global.rmap ../../mod/modreg.rmap ../../inst/memarb/rtl/guinness/marb_top.r ../../mod/fakereg.rmap
- *      id: $Id: reg_map_asm.h,v 1.1 2005/04/24 18:31:04 starvik Exp $
+ *      id: $Id: reg_map_asm.h,v 1.1 2005/04/24 18:31:04 starvik Exp $ 
  * Any changes here will be lost.
  *
  * -*- buffer-read-only: t -*-
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/rt_trace_defs_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/rt_trace_defs_asm.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/rt_trace_defs_asm.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/rt_trace_defs_asm.h	2005-04-24 20:31:04.000000000 +0200
@@ -4,9 +4,9 @@
 /*
  * This file is autogenerated from
  *   file:           ../../inst/rt_trace/rtl/rt_regs.r
- *     id:           rt_regs.r,v 1.18 2005/02/08 15:45:00 stefans Exp
+ *     id:           rt_regs.r,v 1.18 2005/02/08 15:45:00 stefans Exp 
  *     last modfied: Mon Apr 11 16:09:14 2005
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/rt_trace_defs_asm.h ../../inst/rt_trace/rtl/rt_regs.r
  *      id: $Id: rt_trace_defs_asm.h,v 1.1 2005/04/24 18:31:04 starvik Exp $
  * Any changes here will be lost.
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/ser_defs_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/ser_defs_asm.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/ser_defs_asm.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/ser_defs_asm.h	2005-04-24 20:31:04.000000000 +0200
@@ -4,9 +4,9 @@
 /*
  * This file is autogenerated from
  *   file:           ../../inst/ser/rtl/ser_regs.r
- *     id:           ser_regs.r,v 1.23 2005/02/08 13:58:35 perz Exp
+ *     id:           ser_regs.r,v 1.23 2005/02/08 13:58:35 perz Exp 
  *     last modfied: Mon Apr 11 16:09:21 2005
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/ser_defs_asm.h ../../inst/ser/rtl/ser_regs.r
  *      id: $Id: ser_defs_asm.h,v 1.1 2005/04/24 18:31:04 starvik Exp $
  * Any changes here will be lost.
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/sser_defs_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/sser_defs_asm.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/sser_defs_asm.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/sser_defs_asm.h	2005-04-24 20:31:04.000000000 +0200
@@ -4,9 +4,9 @@
 /*
  * This file is autogenerated from
  *   file:           ../../inst/syncser/rtl/sser_regs.r
- *     id:           sser_regs.r,v 1.24 2005/02/11 14:27:36 gunnard Exp
+ *     id:           sser_regs.r,v 1.24 2005/02/11 14:27:36 gunnard Exp 
  *     last modfied: Mon Apr 11 16:09:48 2005
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/sser_defs_asm.h ../../inst/syncser/rtl/sser_regs.r
  *      id: $Id: sser_defs_asm.h,v 1.1 2005/04/24 18:31:04 starvik Exp $
  * Any changes here will be lost.
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/strcop_defs_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/strcop_defs_asm.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/strcop_defs_asm.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/strcop_defs_asm.h	2005-04-24 20:31:04.000000000 +0200
@@ -4,9 +4,9 @@
 /*
  * This file is autogenerated from
  *   file:           ../../inst/strcop/rtl/strcop_regs.r
- *     id:           strcop_regs.r,v 1.5 2003/10/15 12:09:45 kriskn Exp
+ *     id:           strcop_regs.r,v 1.5 2003/10/15 12:09:45 kriskn Exp 
  *     last modfied: Mon Apr 11 16:09:38 2005
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/strcop_defs_asm.h ../../inst/strcop/rtl/strcop_regs.r
  *      id: $Id: strcop_defs_asm.h,v 1.1 2005/04/24 18:31:04 starvik Exp $
  * Any changes here will be lost.
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/strmux_defs_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/strmux_defs_asm.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/strmux_defs_asm.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/strmux_defs_asm.h	2005-04-24 20:31:04.000000000 +0200
@@ -4,9 +4,9 @@
 /*
  * This file is autogenerated from
  *   file:           ../../inst/strmux/rtl/guinness/strmux_regs.r
- *     id:           strmux_regs.r,v 1.10 2005/02/10 10:10:46 perz Exp
+ *     id:           strmux_regs.r,v 1.10 2005/02/10 10:10:46 perz Exp 
  *     last modfied: Mon Apr 11 16:09:43 2005
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/strmux_defs_asm.h ../../inst/strmux/rtl/guinness/strmux_regs.r
  *      id: $Id: strmux_defs_asm.h,v 1.1 2005/04/24 18:31:04 starvik Exp $
  * Any changes here will be lost.
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/timer_defs_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/timer_defs_asm.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/asm/timer_defs_asm.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/asm/timer_defs_asm.h	2005-04-24 20:31:04.000000000 +0200
@@ -4,9 +4,9 @@
 /*
  * This file is autogenerated from
  *   file:           ../../inst/timer/rtl/timer_regs.r
- *     id:           timer_regs.r,v 1.7 2003/03/11 11:16:59 perz Exp
+ *     id:           timer_regs.r,v 1.7 2003/03/11 11:16:59 perz Exp 
  *     last modfied: Mon Apr 11 16:09:53 2005
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/timer_defs_asm.h ../../inst/timer/rtl/timer_regs.r
  *      id: $Id: timer_defs_asm.h,v 1.1 2005/04/24 18:31:04 starvik Exp $
  * Any changes here will be lost.
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/ata_defs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/ata_defs.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/ata_defs.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/ata_defs.h	2005-04-24 20:30:58.000000000 +0200
@@ -4,9 +4,9 @@
 /*
  * This file is autogenerated from
  *   file:           ../../inst/ata/rtl/ata_regs.r
- *     id:           ata_regs.r,v 1.11 2005/02/09 08:27:36 kriskn Exp
+ *     id:           ata_regs.r,v 1.11 2005/02/09 08:27:36 kriskn Exp 
  *     last modfied: Mon Apr 11 16:06:25 2005
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c --outfile ata_defs.h ../../inst/ata/rtl/ata_regs.r
  *      id: $Id: ata_defs.h,v 1.7 2005/04/24 18:30:58 starvik Exp $
  * Any changes here will be lost.
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/bif_core_defs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/bif_core_defs.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/bif_core_defs.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/bif_core_defs.h	2005-04-24 20:30:58.000000000 +0200
@@ -4,9 +4,9 @@
 /*
  * This file is autogenerated from
  *   file:           ../../inst/bif/rtl/bif_core_regs.r
- *     id:           bif_core_regs.r,v 1.17 2005/02/04 13:28:22 np Exp
+ *     id:           bif_core_regs.r,v 1.17 2005/02/04 13:28:22 np Exp 
  *     last modfied: Mon Apr 11 16:06:33 2005
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c --outfile bif_core_defs.h ../../inst/bif/rtl/bif_core_regs.r
  *      id: $Id: bif_core_defs.h,v 1.3 2005/04/24 18:30:58 starvik Exp $
  * Any changes here will be lost.
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/bif_dma_defs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/bif_dma_defs.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/bif_dma_defs.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/bif_dma_defs.h	2005-04-24 20:30:58.000000000 +0200
@@ -4,9 +4,9 @@
 /*
  * This file is autogenerated from
  *   file:           ../../inst/bif/rtl/bif_dma_regs.r
- *     id:           bif_dma_regs.r,v 1.6 2005/02/04 13:28:31 perz Exp
+ *     id:           bif_dma_regs.r,v 1.6 2005/02/04 13:28:31 perz Exp 
  *     last modfied: Mon Apr 11 16:06:33 2005
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c --outfile bif_dma_defs.h ../../inst/bif/rtl/bif_dma_regs.r
  *      id: $Id: bif_dma_defs.h,v 1.2 2005/04/24 18:30:58 starvik Exp $
  * Any changes here will be lost.
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/bif_slave_defs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/bif_slave_defs.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/bif_slave_defs.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/bif_slave_defs.h	2005-04-24 20:30:58.000000000 +0200
@@ -4,9 +4,9 @@
 /*
  * This file is autogenerated from
  *   file:           ../../inst/bif/rtl/bif_slave_regs.r
- *     id:           bif_slave_regs.r,v 1.5 2005/02/04 13:55:28 perz Exp
+ *     id:           bif_slave_regs.r,v 1.5 2005/02/04 13:55:28 perz Exp 
  *     last modfied: Mon Apr 11 16:06:34 2005
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c --outfile bif_slave_defs.h ../../inst/bif/rtl/bif_slave_regs.r
  *      id: $Id: bif_slave_defs.h,v 1.2 2005/04/24 18:30:58 starvik Exp $
  * Any changes here will be lost.
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/config_defs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/config_defs.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/config_defs.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/config_defs.h	2005-04-24 20:30:58.000000000 +0200
@@ -4,9 +4,9 @@
 /*
  * This file is autogenerated from
  *   file:           ../../rtl/config_regs.r
- *     id:           config_regs.r,v 1.23 2004/03/04 11:34:42 mikaeln Exp
+ *     id:           config_regs.r,v 1.23 2004/03/04 11:34:42 mikaeln Exp 
  *     last modfied: Thu Mar  4 12:34:39 2004
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c --outfile config_defs.h ../../rtl/config_regs.r
  *      id: $Id: config_defs.h,v 1.6 2005/04/24 18:30:58 starvik Exp $
  * Any changes here will be lost.
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/cpu_vect.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/cpu_vect.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/cpu_vect.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/cpu_vect.h	2005-04-24 20:30:58.000000000 +0200
@@ -3,7 +3,7 @@
 version . */
 
 #ifndef _______INST_CRISP_DOC_CPU_VECT_R
-#define _______INST_CRISP_DOC_CPU_VECT_R
+#define _______INST_CRISP_DOC_CPU_VECT_R 
 #define NMI_INTR_VECT	0x00
 #define RESERVED_1_INTR_VECT	0x01
 #define RESERVED_2_INTR_VECT	0x02
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/dma.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/dma.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/dma.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/dma.h	2006-06-25 17:01:59.000000000 +0200
@@ -1,6 +1,6 @@
-/* $Id: dma.h,v 1.7 2005/04/24 18:30:58 starvik Exp $
+/* $Id: dma.h,v 1.8 2006/06/25 15:01:59 starvik Exp $
  *
- * DMA C definitions and help macros
+ * DMA C definitions and help macros 
  *
  */
 
@@ -98,10 +98,10 @@
 
 // give stream command
 #define DMA_WR_CMD( inst, cmd_par ) \
-   do { reg_dma_rw_stream_cmd r = {0}; \
-        do { r = REG_RD( dma, inst, rw_stream_cmd ); } while( r.busy ); \
-        r.cmd = (cmd_par); \
-        REG_WR( dma, inst, rw_stream_cmd, r ); \
+   do { reg_dma_rw_stream_cmd __x = {0}; \
+        do { __x = REG_RD( dma, inst, rw_stream_cmd ); } while( __x.busy ); \
+        __x.cmd = (cmd_par); \
+        REG_WR( dma, inst, rw_stream_cmd, __x ); \
       } while( 0 )
 
 // load: g,c,d:burst
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/dma_defs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/dma_defs.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/dma_defs.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/dma_defs.h	2005-04-24 20:30:58.000000000 +0200
@@ -4,9 +4,9 @@
 /*
  * This file is autogenerated from
  *   file:           ../../inst/dma/inst/dma_common/rtl/dma_regdes.r
- *     id:           dma_regdes.r,v 1.39 2005/02/10 14:07:23 janb Exp
+ *     id:           dma_regdes.r,v 1.39 2005/02/10 14:07:23 janb Exp 
  *     last modfied: Mon Apr 11 16:06:51 2005
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c --outfile dma_defs.h ../../inst/dma/inst/dma_common/rtl/dma_regdes.r
  *      id: $Id: dma_defs.h,v 1.7 2005/04/24 18:30:58 starvik Exp $
  * Any changes here will be lost.
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/eth_defs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/eth_defs.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/eth_defs.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/eth_defs.h	2006-01-26 14:45:30.000000000 +0100
@@ -3,12 +3,12 @@
 
 /*
  * This file is autogenerated from
- *   file:           ../../inst/eth/rtl/eth_regs.r
- *     id:           eth_regs.r,v 1.11 2005/02/09 10:48:38 kriskn Exp
- *     last modfied: Mon Apr 11 16:07:03 2005
- *
- *   by /n/asic/design/tools/rdesc/src/rdes2c --outfile eth_defs.h ../../inst/eth/rtl/eth_regs.r
- *      id: $Id: eth_defs.h,v 1.6 2005/04/24 18:30:58 starvik Exp $
+ *   file:           eth.r
+ *     id:           eth_regs.r,v 1.16 2005/05/20 15:41:22 perz Exp 
+ *     last modfied: Mon Jan  9 06:06:41 2006
+ * 
+ *   by /n/asic/design/tools/rdesc/rdes2c eth.r
+ *      id: $Id: eth_defs.h,v 1.7 2006/01/26 13:45:30 karljope Exp $
  * Any changes here will be lost.
  *
  * -*- buffer-read-only: t -*-
@@ -116,26 +116,28 @@
 
 /* Register rw_ga_lo, scope eth, type rw */
 typedef struct {
-  unsigned int table : 32;
+  unsigned int tbl : 32;
 } reg_eth_rw_ga_lo;
 #define REG_RD_ADDR_eth_rw_ga_lo 16
 #define REG_WR_ADDR_eth_rw_ga_lo 16
 
 /* Register rw_ga_hi, scope eth, type rw */
 typedef struct {
-  unsigned int table : 32;
+  unsigned int tbl : 32;
 } reg_eth_rw_ga_hi;
 #define REG_RD_ADDR_eth_rw_ga_hi 20
 #define REG_WR_ADDR_eth_rw_ga_hi 20
 
 /* Register rw_gen_ctrl, scope eth, type rw */
 typedef struct {
-  unsigned int en            : 1;
-  unsigned int phy           : 2;
-  unsigned int protocol      : 1;
-  unsigned int loopback      : 1;
-  unsigned int flow_ctrl_dis : 1;
-  unsigned int dummy1        : 26;
+  unsigned int en         : 1;
+  unsigned int phy        : 2;
+  unsigned int protocol   : 1;
+  unsigned int loopback   : 1;
+  unsigned int flow_ctrl  : 1;
+  unsigned int gtxclk_out : 1;
+  unsigned int phyrst_n   : 1;
+  unsigned int dummy1     : 24;
 } reg_eth_rw_gen_ctrl;
 #define REG_RD_ADDR_eth_rw_gen_ctrl 24
 #define REG_WR_ADDR_eth_rw_gen_ctrl 24
@@ -150,22 +152,23 @@
   unsigned int oversize   : 1;
   unsigned int bad_crc    : 1;
   unsigned int duplex     : 1;
-  unsigned int max_size   : 1;
-  unsigned int dummy1     : 23;
+  unsigned int max_size   : 16;
+  unsigned int dummy1     : 8;
 } reg_eth_rw_rec_ctrl;
 #define REG_RD_ADDR_eth_rw_rec_ctrl 28
 #define REG_WR_ADDR_eth_rw_rec_ctrl 28
 
 /* Register rw_tr_ctrl, scope eth, type rw */
 typedef struct {
-  unsigned int crc        : 1;
-  unsigned int pad        : 1;
-  unsigned int retry      : 1;
-  unsigned int ignore_col : 1;
-  unsigned int cancel     : 1;
-  unsigned int hsh_delay  : 1;
-  unsigned int ignore_crs : 1;
-  unsigned int dummy1     : 25;
+  unsigned int crc         : 1;
+  unsigned int pad         : 1;
+  unsigned int retry       : 1;
+  unsigned int ignore_col  : 1;
+  unsigned int cancel      : 1;
+  unsigned int hsh_delay   : 1;
+  unsigned int ignore_crs  : 1;
+  unsigned int carrier_ext : 1;
+  unsigned int dummy1      : 24;
 } reg_eth_rw_tr_ctrl;
 #define REG_RD_ADDR_eth_rw_tr_ctrl 32
 #define REG_WR_ADDR_eth_rw_tr_ctrl 32
@@ -180,13 +183,10 @@
 
 /* Register rw_mgm_ctrl, scope eth, type rw */
 typedef struct {
-  unsigned int mdio   : 1;
-  unsigned int mdoe   : 1;
-  unsigned int mdc    : 1;
-  unsigned int phyclk : 1;
-  unsigned int txdata : 4;
-  unsigned int txen   : 1;
-  unsigned int dummy1 : 23;
+  unsigned int mdio : 1;
+  unsigned int mdoe : 1;
+  unsigned int mdc  : 1;
+  unsigned int dummy1 : 29;
 } reg_eth_rw_mgm_ctrl;
 #define REG_RD_ADDR_eth_rw_mgm_ctrl 40
 #define REG_WR_ADDR_eth_rw_mgm_ctrl 40
@@ -196,17 +196,8 @@
   unsigned int mdio    : 1;
   unsigned int exc_col : 1;
   unsigned int urun    : 1;
-  unsigned int phyclk  : 1;
-  unsigned int txdata  : 4;
-  unsigned int txen    : 1;
-  unsigned int col     : 1;
-  unsigned int crs     : 1;
-  unsigned int txclk   : 1;
-  unsigned int rxdata  : 4;
-  unsigned int rxer    : 1;
-  unsigned int rxdv    : 1;
-  unsigned int rxclk   : 1;
-  unsigned int dummy1  : 13;
+  unsigned int clk_125 : 1;
+  unsigned int dummy1  : 28;
 } reg_eth_r_stat;
 #define REG_RD_ADDR_eth_r_stat 44
 
@@ -274,83 +265,83 @@
 
 /* Register rw_intr_mask, scope eth, type rw */
 typedef struct {
-  unsigned int crc           : 1;
-  unsigned int align         : 1;
-  unsigned int oversize      : 1;
-  unsigned int congestion    : 1;
-  unsigned int single_col    : 1;
-  unsigned int mult_col      : 1;
-  unsigned int late_col      : 1;
-  unsigned int deferred      : 1;
-  unsigned int carrier_loss  : 1;
-  unsigned int sqe_test_err  : 1;
-  unsigned int orun          : 1;
-  unsigned int urun          : 1;
-  unsigned int excessive_col : 1;
-  unsigned int mdio          : 1;
-  unsigned int dummy1        : 18;
+  unsigned int crc          : 1;
+  unsigned int align        : 1;
+  unsigned int oversize     : 1;
+  unsigned int congestion   : 1;
+  unsigned int single_col   : 1;
+  unsigned int mult_col     : 1;
+  unsigned int late_col     : 1;
+  unsigned int deferred     : 1;
+  unsigned int carrier_loss : 1;
+  unsigned int sqe_test_err : 1;
+  unsigned int orun         : 1;
+  unsigned int urun         : 1;
+  unsigned int exc_col      : 1;
+  unsigned int mdio         : 1;
+  unsigned int dummy1       : 18;
 } reg_eth_rw_intr_mask;
 #define REG_RD_ADDR_eth_rw_intr_mask 76
 #define REG_WR_ADDR_eth_rw_intr_mask 76
 
 /* Register rw_ack_intr, scope eth, type rw */
 typedef struct {
-  unsigned int crc           : 1;
-  unsigned int align         : 1;
-  unsigned int oversize      : 1;
-  unsigned int congestion    : 1;
-  unsigned int single_col    : 1;
-  unsigned int mult_col      : 1;
-  unsigned int late_col      : 1;
-  unsigned int deferred      : 1;
-  unsigned int carrier_loss  : 1;
-  unsigned int sqe_test_err  : 1;
-  unsigned int orun          : 1;
-  unsigned int urun          : 1;
-  unsigned int excessive_col : 1;
-  unsigned int mdio          : 1;
-  unsigned int dummy1        : 18;
+  unsigned int crc          : 1;
+  unsigned int align        : 1;
+  unsigned int oversize     : 1;
+  unsigned int congestion   : 1;
+  unsigned int single_col   : 1;
+  unsigned int mult_col     : 1;
+  unsigned int late_col     : 1;
+  unsigned int deferred     : 1;
+  unsigned int carrier_loss : 1;
+  unsigned int sqe_test_err : 1;
+  unsigned int orun         : 1;
+  unsigned int urun         : 1;
+  unsigned int exc_col      : 1;
+  unsigned int mdio         : 1;
+  unsigned int dummy1       : 18;
 } reg_eth_rw_ack_intr;
 #define REG_RD_ADDR_eth_rw_ack_intr 80
 #define REG_WR_ADDR_eth_rw_ack_intr 80
 
 /* Register r_intr, scope eth, type r */
 typedef struct {
-  unsigned int crc           : 1;
-  unsigned int align         : 1;
-  unsigned int oversize      : 1;
-  unsigned int congestion    : 1;
-  unsigned int single_col    : 1;
-  unsigned int mult_col      : 1;
-  unsigned int late_col      : 1;
-  unsigned int deferred      : 1;
-  unsigned int carrier_loss  : 1;
-  unsigned int sqe_test_err  : 1;
-  unsigned int orun          : 1;
-  unsigned int urun          : 1;
-  unsigned int excessive_col : 1;
-  unsigned int mdio          : 1;
-  unsigned int dummy1        : 18;
+  unsigned int crc          : 1;
+  unsigned int align        : 1;
+  unsigned int oversize     : 1;
+  unsigned int congestion   : 1;
+  unsigned int single_col   : 1;
+  unsigned int mult_col     : 1;
+  unsigned int late_col     : 1;
+  unsigned int deferred     : 1;
+  unsigned int carrier_loss : 1;
+  unsigned int sqe_test_err : 1;
+  unsigned int orun         : 1;
+  unsigned int urun         : 1;
+  unsigned int exc_col      : 1;
+  unsigned int mdio         : 1;
+  unsigned int dummy1       : 18;
 } reg_eth_r_intr;
 #define REG_RD_ADDR_eth_r_intr 84
 
 /* Register r_masked_intr, scope eth, type r */
 typedef struct {
-  unsigned int crc           : 1;
-  unsigned int align         : 1;
-  unsigned int oversize      : 1;
-  unsigned int congestion    : 1;
-  unsigned int single_col    : 1;
-  unsigned int mult_col      : 1;
-  unsigned int late_col      : 1;
-  unsigned int deferred      : 1;
-  unsigned int carrier_loss  : 1;
-  unsigned int sqe_test_err  : 1;
-  unsigned int orun          : 1;
-  unsigned int urun          : 1;
-  unsigned int excessive_col : 1;
-  unsigned int mdio          : 1;
-  unsigned int dummy1        : 18;
+  unsigned int crc          : 1;
+  unsigned int align        : 1;
+  unsigned int oversize     : 1;
+  unsigned int congestion   : 1;
+  unsigned int single_col   : 1;
+  unsigned int mult_col     : 1;
+  unsigned int late_col     : 1;
+  unsigned int deferred     : 1;
+  unsigned int carrier_loss : 1;
+  unsigned int sqe_test_err : 1;
+  unsigned int orun         : 1;
+  unsigned int urun         : 1;
+  unsigned int exc_col      : 1;
+  unsigned int mdio         : 1;
+  unsigned int dummy1       : 18;
 } reg_eth_r_masked_intr;
 #define REG_RD_ADDR_eth_r_masked_intr 88
 
@@ -360,12 +351,15 @@
   regk_eth_discard                         = 0x00000000,
   regk_eth_ether                           = 0x00000000,
   regk_eth_full                            = 0x00000001,
+  regk_eth_gmii                            = 0x00000003,
+  regk_eth_gtxclk                          = 0x00000001,
   regk_eth_half                            = 0x00000000,
   regk_eth_hsh                             = 0x00000001,
   regk_eth_mii                             = 0x00000001,
+  regk_eth_mii_arec                        = 0x00000002,
   regk_eth_mii_clk                         = 0x00000000,
-  regk_eth_mii_rec                         = 0x00000002,
   regk_eth_no                              = 0x00000000,
+  regk_eth_phyrst                          = 0x00000000,
   regk_eth_rec                             = 0x00000001,
   regk_eth_rw_ga_hi_default                = 0x00000000,
   regk_eth_rw_ga_lo_default                = 0x00000000,
@@ -377,8 +371,8 @@
   regk_eth_rw_ma1_lo_default               = 0x00000000,
   regk_eth_rw_mgm_ctrl_default             = 0x00000000,
   regk_eth_rw_test_ctrl_default            = 0x00000000,
-  regk_eth_size1518                        = 0x00000000,
-  regk_eth_size1522                        = 0x00000001,
+  regk_eth_size1518                        = 0x000005ee,
+  regk_eth_size1522                        = 0x000005f2,
   regk_eth_yes                             = 0x00000001
 };
 #endif /* __eth_defs_h */
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/eth_defs_fs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/eth_defs_fs.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/eth_defs_fs.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/eth_defs_fs.h	2007-02-07 10:36:10.000000000 +0100
@@ -0,0 +1,384 @@
+#ifndef __eth_defs_h
+#define __eth_defs_h
+
+/*
+ * This file is autogenerated from
+ *   file:           eth_regs.r
+ *     id:           eth_regs.r,v 1.17 2006/02/08 16:47:19 perz Exp perz 
+ *     last modfied: Tue Feb  6 13:57:16 2007
+ * 
+ *   by /n/asic/design/io/eth/inst/rdesc/rdes2c eth_regs.r
+ *      id: $Id: eth_defs_fs.h,v 1.1 2007/02/07 09:36:10 karljope Exp $
+ * Any changes here will be lost.
+ *
+ * -*- buffer-read-only: t -*-
+ */
+/* Main access macros */
+#ifndef REG_RD
+#define REG_RD( scope, inst, reg ) \
+  REG_READ( reg_##scope##_##reg, \
+            (inst) + REG_RD_ADDR_##scope##_##reg )
+#endif
+
+#ifndef REG_WR
+#define REG_WR( scope, inst, reg, val ) \
+  REG_WRITE( reg_##scope##_##reg, \
+             (inst) + REG_WR_ADDR_##scope##_##reg, (val) )
+#endif
+
+#ifndef REG_RD_VECT
+#define REG_RD_VECT( scope, inst, reg, index ) \
+  REG_READ( reg_##scope##_##reg, \
+            (inst) + REG_RD_ADDR_##scope##_##reg + \
+	    (index) * STRIDE_##scope##_##reg )
+#endif
+
+#ifndef REG_WR_VECT
+#define REG_WR_VECT( scope, inst, reg, index, val ) \
+  REG_WRITE( reg_##scope##_##reg, \
+             (inst) + REG_WR_ADDR_##scope##_##reg + \
+	     (index) * STRIDE_##scope##_##reg, (val) )
+#endif
+
+#ifndef REG_RD_INT
+#define REG_RD_INT( scope, inst, reg ) \
+  REG_READ( int, (inst) + REG_RD_ADDR_##scope##_##reg )
+#endif
+
+#ifndef REG_WR_INT
+#define REG_WR_INT( scope, inst, reg, val ) \
+  REG_WRITE( int, (inst) + REG_WR_ADDR_##scope##_##reg, (val) )
+#endif
+
+#ifndef REG_RD_INT_VECT
+#define REG_RD_INT_VECT( scope, inst, reg, index ) \
+  REG_READ( int, (inst) + REG_RD_ADDR_##scope##_##reg + \
+	    (index) * STRIDE_##scope##_##reg )
+#endif
+
+#ifndef REG_WR_INT_VECT
+#define REG_WR_INT_VECT( scope, inst, reg, index, val ) \
+  REG_WRITE( int, (inst) + REG_WR_ADDR_##scope##_##reg + \
+	     (index) * STRIDE_##scope##_##reg, (val) )
+#endif
+
+#ifndef REG_TYPE_CONV
+#define REG_TYPE_CONV( type, orgtype, val ) \
+  ( { union { orgtype o; type n; } r; r.o = val; r.n; } )
+#endif
+
+#ifndef reg_page_size
+#define reg_page_size 8192
+#endif
+
+#ifndef REG_ADDR
+#define REG_ADDR( scope, inst, reg ) \
+  ( (inst) + REG_RD_ADDR_##scope##_##reg )
+#endif
+
+#ifndef REG_ADDR_VECT
+#define REG_ADDR_VECT( scope, inst, reg, index ) \
+  ( (inst) + REG_RD_ADDR_##scope##_##reg + \
+    (index) * STRIDE_##scope##_##reg )
+#endif
+
+/* C-code for register scope eth */
+
+/* Register rw_ma0_lo, scope eth, type rw */
+typedef struct {
+  unsigned int addr : 32;
+} reg_eth_rw_ma0_lo;
+#define REG_RD_ADDR_eth_rw_ma0_lo 0
+#define REG_WR_ADDR_eth_rw_ma0_lo 0
+
+/* Register rw_ma0_hi, scope eth, type rw */
+typedef struct {
+  unsigned int addr : 16;
+  unsigned int dummy1 : 16;
+} reg_eth_rw_ma0_hi;
+#define REG_RD_ADDR_eth_rw_ma0_hi 4
+#define REG_WR_ADDR_eth_rw_ma0_hi 4
+
+/* Register rw_ma1_lo, scope eth, type rw */
+typedef struct {
+  unsigned int addr : 32;
+} reg_eth_rw_ma1_lo;
+#define REG_RD_ADDR_eth_rw_ma1_lo 8
+#define REG_WR_ADDR_eth_rw_ma1_lo 8
+
+/* Register rw_ma1_hi, scope eth, type rw */
+typedef struct {
+  unsigned int addr : 16;
+  unsigned int dummy1 : 16;
+} reg_eth_rw_ma1_hi;
+#define REG_RD_ADDR_eth_rw_ma1_hi 12
+#define REG_WR_ADDR_eth_rw_ma1_hi 12
+
+/* Register rw_ga_lo, scope eth, type rw */
+typedef struct {
+  unsigned int table : 32;
+} reg_eth_rw_ga_lo;
+#define REG_RD_ADDR_eth_rw_ga_lo 16
+#define REG_WR_ADDR_eth_rw_ga_lo 16
+
+/* Register rw_ga_hi, scope eth, type rw */
+typedef struct {
+  unsigned int table : 32;
+} reg_eth_rw_ga_hi;
+#define REG_RD_ADDR_eth_rw_ga_hi 20
+#define REG_WR_ADDR_eth_rw_ga_hi 20
+
+/* Register rw_gen_ctrl, scope eth, type rw */
+typedef struct {
+  unsigned int en        : 1;
+  unsigned int phy       : 2;
+  unsigned int protocol  : 1;
+  unsigned int loopback  : 1;
+  unsigned int flow_ctrl : 1;
+  unsigned int dummy1    : 26;
+} reg_eth_rw_gen_ctrl;
+#define REG_RD_ADDR_eth_rw_gen_ctrl 24
+#define REG_WR_ADDR_eth_rw_gen_ctrl 24
+
+/* Register rw_rec_ctrl, scope eth, type rw */
+typedef struct {
+  unsigned int ma0        : 1;
+  unsigned int ma1        : 1;
+  unsigned int individual : 1;
+  unsigned int broadcast  : 1;
+  unsigned int undersize  : 1;
+  unsigned int oversize   : 1;
+  unsigned int bad_crc    : 1;
+  unsigned int duplex     : 1;
+  unsigned int max_size   : 1;
+  unsigned int dummy1     : 23;
+} reg_eth_rw_rec_ctrl;
+#define REG_RD_ADDR_eth_rw_rec_ctrl 28
+#define REG_WR_ADDR_eth_rw_rec_ctrl 28
+
+/* Register rw_tr_ctrl, scope eth, type rw */
+typedef struct {
+  unsigned int crc        : 1;
+  unsigned int pad        : 1;
+  unsigned int retry      : 1;
+  unsigned int ignore_col : 1;
+  unsigned int cancel     : 1;
+  unsigned int hsh_delay  : 1;
+  unsigned int ignore_crs : 1;
+  unsigned int dummy1     : 25;
+} reg_eth_rw_tr_ctrl;
+#define REG_RD_ADDR_eth_rw_tr_ctrl 32
+#define REG_WR_ADDR_eth_rw_tr_ctrl 32
+
+/* Register rw_clr_err, scope eth, type rw */
+typedef struct {
+  unsigned int clr : 1;
+  unsigned int dummy1 : 31;
+} reg_eth_rw_clr_err;
+#define REG_RD_ADDR_eth_rw_clr_err 36
+#define REG_WR_ADDR_eth_rw_clr_err 36
+
+/* Register rw_mgm_ctrl, scope eth, type rw */
+typedef struct {
+  unsigned int mdio   : 1;
+  unsigned int mdoe   : 1;
+  unsigned int mdc    : 1;
+  unsigned int phyclk : 1;
+  unsigned int txdata : 4;
+  unsigned int txen   : 1;
+  unsigned int dummy1 : 23;
+} reg_eth_rw_mgm_ctrl;
+#define REG_RD_ADDR_eth_rw_mgm_ctrl 40
+#define REG_WR_ADDR_eth_rw_mgm_ctrl 40
+
+/* Register r_stat, scope eth, type r */
+typedef struct {
+  unsigned int mdio    : 1;
+  unsigned int exc_col : 1;
+  unsigned int urun    : 1;
+  unsigned int phyclk  : 1;
+  unsigned int txdata  : 4;
+  unsigned int txen    : 1;
+  unsigned int col     : 1;
+  unsigned int crs     : 1;
+  unsigned int txclk   : 1;
+  unsigned int rxdata  : 4;
+  unsigned int rxer    : 1;
+  unsigned int rxdv    : 1;
+  unsigned int rxclk   : 1;
+  unsigned int dummy1  : 13;
+} reg_eth_r_stat;
+#define REG_RD_ADDR_eth_r_stat 44
+
+/* Register rs_rec_cnt, scope eth, type rs */
+typedef struct {
+  unsigned int crc_err    : 8;
+  unsigned int align_err  : 8;
+  unsigned int oversize   : 8;
+  unsigned int congestion : 8;
+} reg_eth_rs_rec_cnt;
+#define REG_RD_ADDR_eth_rs_rec_cnt 48
+
+/* Register r_rec_cnt, scope eth, type r */
+typedef struct {
+  unsigned int crc_err    : 8;
+  unsigned int align_err  : 8;
+  unsigned int oversize   : 8;
+  unsigned int congestion : 8;
+} reg_eth_r_rec_cnt;
+#define REG_RD_ADDR_eth_r_rec_cnt 52
+
+/* Register rs_tr_cnt, scope eth, type rs */
+typedef struct {
+  unsigned int single_col : 8;
+  unsigned int mult_col   : 8;
+  unsigned int late_col   : 8;
+  unsigned int deferred   : 8;
+} reg_eth_rs_tr_cnt;
+#define REG_RD_ADDR_eth_rs_tr_cnt 56
+
+/* Register r_tr_cnt, scope eth, type r */
+typedef struct {
+  unsigned int single_col : 8;
+  unsigned int mult_col   : 8;
+  unsigned int late_col   : 8;
+  unsigned int deferred   : 8;
+} reg_eth_r_tr_cnt;
+#define REG_RD_ADDR_eth_r_tr_cnt 60
+
+/* Register rs_phy_cnt, scope eth, type rs */
+typedef struct {
+  unsigned int carrier_loss : 8;
+  unsigned int sqe_err      : 8;
+  unsigned int dummy1       : 16;
+} reg_eth_rs_phy_cnt;
+#define REG_RD_ADDR_eth_rs_phy_cnt 64
+
+/* Register r_phy_cnt, scope eth, type r */
+typedef struct {
+  unsigned int carrier_loss : 8;
+  unsigned int sqe_err      : 8;
+  unsigned int dummy1       : 16;
+} reg_eth_r_phy_cnt;
+#define REG_RD_ADDR_eth_r_phy_cnt 68
+
+/* Register rw_test_ctrl, scope eth, type rw */
+typedef struct {
+  unsigned int snmp_inc : 1;
+  unsigned int snmp     : 1;
+  unsigned int backoff  : 1;
+  unsigned int dummy1   : 29;
+} reg_eth_rw_test_ctrl;
+#define REG_RD_ADDR_eth_rw_test_ctrl 72
+#define REG_WR_ADDR_eth_rw_test_ctrl 72
+
+/* Register rw_intr_mask, scope eth, type rw */
+typedef struct {
+  unsigned int crc          : 1;
+  unsigned int align        : 1;
+  unsigned int oversize     : 1;
+  unsigned int congestion   : 1;
+  unsigned int single_col   : 1;
+  unsigned int mult_col     : 1;
+  unsigned int late_col     : 1;
+  unsigned int deferred     : 1;
+  unsigned int carrier_loss : 1;
+  unsigned int sqe_test_err : 1;
+  unsigned int orun         : 1;
+  unsigned int urun         : 1;
+  unsigned int exc_col      : 1;
+  unsigned int mdio         : 1;
+  unsigned int dummy1       : 18;
+} reg_eth_rw_intr_mask;
+#define REG_RD_ADDR_eth_rw_intr_mask 76
+#define REG_WR_ADDR_eth_rw_intr_mask 76
+
+/* Register rw_ack_intr, scope eth, type rw */
+typedef struct {
+  unsigned int crc          : 1;
+  unsigned int align        : 1;
+  unsigned int oversize     : 1;
+  unsigned int congestion   : 1;
+  unsigned int single_col   : 1;
+  unsigned int mult_col     : 1;
+  unsigned int late_col     : 1;
+  unsigned int deferred     : 1;
+  unsigned int carrier_loss : 1;
+  unsigned int sqe_test_err : 1;
+  unsigned int orun         : 1;
+  unsigned int urun         : 1;
+  unsigned int exc_col      : 1;
+  unsigned int mdio         : 1;
+  unsigned int dummy1       : 18;
+} reg_eth_rw_ack_intr;
+#define REG_RD_ADDR_eth_rw_ack_intr 80
+#define REG_WR_ADDR_eth_rw_ack_intr 80
+
+/* Register r_intr, scope eth, type r */
+typedef struct {
+  unsigned int crc          : 1;
+  unsigned int align        : 1;
+  unsigned int oversize     : 1;
+  unsigned int congestion   : 1;
+  unsigned int single_col   : 1;
+  unsigned int mult_col     : 1;
+  unsigned int late_col     : 1;
+  unsigned int deferred     : 1;
+  unsigned int carrier_loss : 1;
+  unsigned int sqe_test_err : 1;
+  unsigned int orun         : 1;
+  unsigned int urun         : 1;
+  unsigned int exc_col      : 1;
+  unsigned int mdio         : 1;
+  unsigned int dummy1       : 18;
+} reg_eth_r_intr;
+#define REG_RD_ADDR_eth_r_intr 84
+
+/* Register r_masked_intr, scope eth, type r */
+typedef struct {
+  unsigned int crc          : 1;
+  unsigned int align        : 1;
+  unsigned int oversize     : 1;
+  unsigned int congestion   : 1;
+  unsigned int single_col   : 1;
+  unsigned int mult_col     : 1;
+  unsigned int late_col     : 1;
+  unsigned int deferred     : 1;
+  unsigned int carrier_loss : 1;
+  unsigned int sqe_test_err : 1;
+  unsigned int orun         : 1;
+  unsigned int urun         : 1;
+  unsigned int exc_col      : 1;
+  unsigned int mdio         : 1;
+  unsigned int dummy1       : 18;
+} reg_eth_r_masked_intr;
+#define REG_RD_ADDR_eth_r_masked_intr 88
+
+
+/* Constants */
+enum {
+  regk_eth_discard                         = 0x00000000,
+  regk_eth_ether                           = 0x00000000,
+  regk_eth_full                            = 0x00000001,
+  regk_eth_half                            = 0x00000000,
+  regk_eth_hsh                             = 0x00000001,
+  regk_eth_mii                             = 0x00000001,
+  regk_eth_mii_arec                        = 0x00000002,
+  regk_eth_mii_clk                         = 0x00000000,
+  regk_eth_no                              = 0x00000000,
+  regk_eth_rec                             = 0x00000001,
+  regk_eth_rw_ga_hi_default                = 0x00000000,
+  regk_eth_rw_ga_lo_default                = 0x00000000,
+  regk_eth_rw_gen_ctrl_default             = 0x00000000,
+  regk_eth_rw_intr_mask_default            = 0x00000000,
+  regk_eth_rw_ma0_hi_default               = 0x00000000,
+  regk_eth_rw_ma0_lo_default               = 0x00000000,
+  regk_eth_rw_ma1_hi_default               = 0x00000000,
+  regk_eth_rw_ma1_lo_default               = 0x00000000,
+  regk_eth_rw_mgm_ctrl_default             = 0x00000000,
+  regk_eth_rw_test_ctrl_default            = 0x00000000,
+  regk_eth_size1518                        = 0x00000000,
+  regk_eth_size1522                        = 0x00000001,
+  regk_eth_yes                             = 0x00000001
+};
+#endif /* __eth_defs_h */
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/extmem_defs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/extmem_defs.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/extmem_defs.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/extmem_defs.h	2004-06-04 09:15:33.000000000 +0200
@@ -4,9 +4,9 @@
 /*
  * This file is autogenerated from
  *   file:           ../../inst/ext_mem/mod/extmem_regs.r
- *     id:           extmem_regs.r,v 1.1 2004/02/16 13:29:30 np Exp
+ *     id:           extmem_regs.r,v 1.1 2004/02/16 13:29:30 np Exp 
  *     last modfied: Tue Mar 30 22:26:21 2004
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c --outfile extmem_defs.h ../../inst/ext_mem/mod/extmem_regs.r
  *      id: $Id: extmem_defs.h,v 1.5 2004/06/04 07:15:33 starvik Exp $
  * Any changes here will be lost.
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/gio_defs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/gio_defs.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/gio_defs.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/gio_defs.h	2005-04-24 20:30:58.000000000 +0200
@@ -4,9 +4,9 @@
 /*
  * This file is autogenerated from
  *   file:           ../../inst/gio/rtl/gio_regs.r
- *     id:           gio_regs.r,v 1.5 2005/02/04 09:43:21 perz Exp
+ *     id:           gio_regs.r,v 1.5 2005/02/04 09:43:21 perz Exp 
  *     last modfied: Mon Apr 11 16:07:47 2005
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c --outfile gio_defs.h ../../inst/gio/rtl/gio_regs.r
  *      id: $Id: gio_defs.h,v 1.6 2005/04/24 18:30:58 starvik Exp $
  * Any changes here will be lost.
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/intr_vect.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/intr_vect.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/intr_vect.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/intr_vect.h	2005-05-23 14:59:21.000000000 +0200
@@ -3,7 +3,7 @@
 version . */
 
 #ifndef _______INST_INTR_VECT_RTL_GUINNESS_IVMASK_CONFIG_R
-#define _______INST_INTR_VECT_RTL_GUINNESS_IVMASK_CONFIG_R
+#define _______INST_INTR_VECT_RTL_GUINNESS_IVMASK_CONFIG_R 
 #define MEMARB_INTR_VECT	0x31
 #define GEN_IO_INTR_VECT	0x32
 #define IOP0_INTR_VECT	0x33
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/intr_vect_defs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/intr_vect_defs.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/intr_vect_defs.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/intr_vect_defs.h	2005-04-24 20:30:58.000000000 +0200
@@ -4,9 +4,9 @@
 /*
  * This file is autogenerated from
  *   file:           ../../inst/intr_vect/rtl/guinness/ivmask.config.r
- *     id:           ivmask.config.r,v 1.4 2005/02/15 16:05:38 stefans Exp
+ *     id:           ivmask.config.r,v 1.4 2005/02/15 16:05:38 stefans Exp 
  *     last modfied: Mon Apr 11 16:08:03 2005
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c --outfile intr_vect_defs.h ../../inst/intr_vect/rtl/guinness/ivmask.config.r
  *      id: $Id: intr_vect_defs.h,v 1.8 2005/04/24 18:30:58 starvik Exp $
  * Any changes here will be lost.
@@ -209,7 +209,7 @@
 #define REG_RD_ADDR_intr_vect_r_guru 16
 
 /* Register rw_ipi, scope intr_vect, type rw */
-typedef struct
+typedef struct 
 {
   unsigned int vector;
 } reg_intr_vect_rw_ipi;
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/Makefile linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/Makefile
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/Makefile	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/Makefile	2004-01-07 21:34:55.000000000 +0100
@@ -125,14 +125,14 @@
 	done
 
 .PHONY: axw
-## %.axw  - Generate the specified .axw file (doesn't work for all files
+## %.axw  - Generate the specified .axw file (doesn't work for all files 
 ##          due to inconsistent naming of .r files.
 %.axw: axw
 	@for RDES in $(IOPROCREGDESC); do \
 		if echo "$$RDES" | grep $* ; then \
 		  $(RDES2TXT) $$RDES; \
 		fi \
-	done
+	done	
 
 .PHONY: clean
 ## clean  - Remove .h files and .axw files.
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_crc_par_defs_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_crc_par_defs_asm.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_crc_par_defs_asm.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_crc_par_defs_asm.h	2005-04-24 20:31:06.000000000 +0200
@@ -6,7 +6,7 @@
  *   file:           ../../inst/io_proc/rtl/iop_crc_par.r
  *     id:           <not found>
  *     last modfied: Mon Apr 11 16:08:45 2005
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/iop_crc_par_defs_asm.h ../../inst/io_proc/rtl/iop_crc_par.r
  *      id: $Id: iop_crc_par_defs_asm.h,v 1.5 2005/04/24 18:31:06 starvik Exp $
  * Any changes here will be lost.
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_dmc_in_defs_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_dmc_in_defs_asm.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_dmc_in_defs_asm.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_dmc_in_defs_asm.h	2005-04-24 20:31:06.000000000 +0200
@@ -4,9 +4,9 @@
 /*
  * This file is autogenerated from
  *   file:           ../../inst/io_proc/rtl/iop_dmc_in.r
- *     id:           iop_dmc_in.r,v 1.26 2005/02/16 09:14:17 niklaspa Exp
+ *     id:           iop_dmc_in.r,v 1.26 2005/02/16 09:14:17 niklaspa Exp 
  *     last modfied: Mon Apr 11 16:08:45 2005
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/iop_dmc_in_defs_asm.h ../../inst/io_proc/rtl/iop_dmc_in.r
  *      id: $Id: iop_dmc_in_defs_asm.h,v 1.5 2005/04/24 18:31:06 starvik Exp $
  * Any changes here will be lost.
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_dmc_out_defs_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_dmc_out_defs_asm.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_dmc_out_defs_asm.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_dmc_out_defs_asm.h	2005-04-24 20:31:06.000000000 +0200
@@ -4,9 +4,9 @@
 /*
  * This file is autogenerated from
  *   file:           ../../inst/io_proc/rtl/iop_dmc_out.r
- *     id:           iop_dmc_out.r,v 1.30 2005/02/16 09:14:11 niklaspa Exp
+ *     id:           iop_dmc_out.r,v 1.30 2005/02/16 09:14:11 niklaspa Exp 
  *     last modfied: Mon Apr 11 16:08:45 2005
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/iop_dmc_out_defs_asm.h ../../inst/io_proc/rtl/iop_dmc_out.r
  *      id: $Id: iop_dmc_out_defs_asm.h,v 1.5 2005/04/24 18:31:06 starvik Exp $
  * Any changes here will be lost.
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_fifo_in_defs_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_fifo_in_defs_asm.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_fifo_in_defs_asm.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_fifo_in_defs_asm.h	2005-04-24 20:31:06.000000000 +0200
@@ -6,7 +6,7 @@
  *   file:           ../../inst/io_proc/rtl/iop_fifo_in.r
  *     id:           <not found>
  *     last modfied: Mon Apr 11 16:10:07 2005
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/iop_fifo_in_defs_asm.h ../../inst/io_proc/rtl/iop_fifo_in.r
  *      id: $Id: iop_fifo_in_defs_asm.h,v 1.5 2005/04/24 18:31:06 starvik Exp $
  * Any changes here will be lost.
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_fifo_in_extra_defs_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_fifo_in_extra_defs_asm.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_fifo_in_extra_defs_asm.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_fifo_in_extra_defs_asm.h	2005-04-24 20:31:06.000000000 +0200
@@ -6,7 +6,7 @@
  *   file:           ../../inst/io_proc/rtl/iop_fifo_in_extra.r
  *     id:           <not found>
  *     last modfied: Mon Apr 11 16:10:08 2005
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/iop_fifo_in_extra_defs_asm.h ../../inst/io_proc/rtl/iop_fifo_in_extra.r
  *      id: $Id: iop_fifo_in_extra_defs_asm.h,v 1.1 2005/04/24 18:31:06 starvik Exp $
  * Any changes here will be lost.
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_fifo_out_defs_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_fifo_out_defs_asm.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_fifo_out_defs_asm.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_fifo_out_defs_asm.h	2005-04-24 20:31:06.000000000 +0200
@@ -6,7 +6,7 @@
  *   file:           ../../inst/io_proc/rtl/iop_fifo_out.r
  *     id:           <not found>
  *     last modfied: Mon Apr 11 16:10:09 2005
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/iop_fifo_out_defs_asm.h ../../inst/io_proc/rtl/iop_fifo_out.r
  *      id: $Id: iop_fifo_out_defs_asm.h,v 1.5 2005/04/24 18:31:06 starvik Exp $
  * Any changes here will be lost.
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_fifo_out_extra_defs_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_fifo_out_extra_defs_asm.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_fifo_out_extra_defs_asm.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_fifo_out_extra_defs_asm.h	2005-04-24 20:31:06.000000000 +0200
@@ -6,7 +6,7 @@
  *   file:           ../../inst/io_proc/rtl/iop_fifo_out_extra.r
  *     id:           <not found>
  *     last modfied: Mon Apr 11 16:10:10 2005
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/iop_fifo_out_extra_defs_asm.h ../../inst/io_proc/rtl/iop_fifo_out_extra.r
  *      id: $Id: iop_fifo_out_extra_defs_asm.h,v 1.1 2005/04/24 18:31:06 starvik Exp $
  * Any changes here will be lost.
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_mpu_defs_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_mpu_defs_asm.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_mpu_defs_asm.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_mpu_defs_asm.h	2005-04-24 20:31:06.000000000 +0200
@@ -4,9 +4,9 @@
 /*
  * This file is autogenerated from
  *   file:           ../../inst/io_proc/rtl/iop_mpu.r
- *     id:           iop_mpu.r,v 1.30 2005/02/17 08:12:33 niklaspa Exp
+ *     id:           iop_mpu.r,v 1.30 2005/02/17 08:12:33 niklaspa Exp 
  *     last modfied: Mon Apr 11 16:08:45 2005
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/iop_mpu_defs_asm.h ../../inst/io_proc/rtl/iop_mpu.r
  *      id: $Id: iop_mpu_defs_asm.h,v 1.5 2005/04/24 18:31:06 starvik Exp $
  * Any changes here will be lost.
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_reg_space_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_reg_space_asm.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_reg_space_asm.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_reg_space_asm.h	2005-04-24 20:31:06.000000000 +0200
@@ -1,5 +1,5 @@
 /* Autogenerated Changes here will be lost!
- * generated by ../gen_sw.pl Mon Apr 11 16:10:18 2005 iop_sw.cfg
+ * generated by ../gen_sw.pl Mon Apr 11 16:10:18 2005 iop_sw.cfg 
  */
 #define iop_version 0
 #define iop_fifo_in0_extra 64
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_sap_in_defs_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_sap_in_defs_asm.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_sap_in_defs_asm.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_sap_in_defs_asm.h	2005-04-24 20:31:06.000000000 +0200
@@ -6,7 +6,7 @@
  *   file:           ../../inst/io_proc/rtl/iop_sap_in.r
  *     id:           <not found>
  *     last modfied: Mon Apr 11 16:08:45 2005
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/iop_sap_in_defs_asm.h ../../inst/io_proc/rtl/iop_sap_in.r
  *      id: $Id: iop_sap_in_defs_asm.h,v 1.5 2005/04/24 18:31:06 starvik Exp $
  * Any changes here will be lost.
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_sap_out_defs_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_sap_out_defs_asm.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_sap_out_defs_asm.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_sap_out_defs_asm.h	2005-04-24 20:31:06.000000000 +0200
@@ -6,7 +6,7 @@
  *   file:           ../../inst/io_proc/rtl/iop_sap_out.r
  *     id:           <not found>
  *     last modfied: Mon Apr 11 16:08:46 2005
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/iop_sap_out_defs_asm.h ../../inst/io_proc/rtl/iop_sap_out.r
  *      id: $Id: iop_sap_out_defs_asm.h,v 1.5 2005/04/24 18:31:06 starvik Exp $
  * Any changes here will be lost.
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_scrc_in_defs_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_scrc_in_defs_asm.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_scrc_in_defs_asm.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_scrc_in_defs_asm.h	2005-04-24 20:31:06.000000000 +0200
@@ -4,9 +4,9 @@
 /*
  * This file is autogenerated from
  *   file:           ../../inst/io_proc/rtl/iop_scrc_in.r
- *     id:           iop_scrc_in.r,v 1.10 2005/02/16 09:13:58 niklaspa Exp
+ *     id:           iop_scrc_in.r,v 1.10 2005/02/16 09:13:58 niklaspa Exp 
  *     last modfied: Mon Apr 11 16:08:46 2005
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/iop_scrc_in_defs_asm.h ../../inst/io_proc/rtl/iop_scrc_in.r
  *      id: $Id: iop_scrc_in_defs_asm.h,v 1.5 2005/04/24 18:31:06 starvik Exp $
  * Any changes here will be lost.
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_scrc_out_defs_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_scrc_out_defs_asm.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_scrc_out_defs_asm.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_scrc_out_defs_asm.h	2005-04-24 20:31:06.000000000 +0200
@@ -4,9 +4,9 @@
 /*
  * This file is autogenerated from
  *   file:           ../../inst/io_proc/rtl/iop_scrc_out.r
- *     id:           iop_scrc_out.r,v 1.11 2005/02/16 09:13:38 niklaspa Exp
+ *     id:           iop_scrc_out.r,v 1.11 2005/02/16 09:13:38 niklaspa Exp 
  *     last modfied: Mon Apr 11 16:08:46 2005
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/iop_scrc_out_defs_asm.h ../../inst/io_proc/rtl/iop_scrc_out.r
  *      id: $Id: iop_scrc_out_defs_asm.h,v 1.5 2005/04/24 18:31:06 starvik Exp $
  * Any changes here will be lost.
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_spu_defs_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_spu_defs_asm.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_spu_defs_asm.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_spu_defs_asm.h	2005-04-24 20:31:06.000000000 +0200
@@ -6,7 +6,7 @@
  *   file:           ../../inst/io_proc/rtl/iop_spu.r
  *     id:           <not found>
  *     last modfied: Mon Apr 11 16:08:46 2005
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/iop_spu_defs_asm.h ../../inst/io_proc/rtl/iop_spu.r
  *      id: $Id: iop_spu_defs_asm.h,v 1.5 2005/04/24 18:31:06 starvik Exp $
  * Any changes here will be lost.
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_sw_cfg_defs_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_sw_cfg_defs_asm.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_sw_cfg_defs_asm.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_sw_cfg_defs_asm.h	2005-04-24 20:31:07.000000000 +0200
@@ -6,7 +6,7 @@
  *   file:           ../../inst/io_proc/rtl/guinness/iop_sw_cfg.r
  *     id:           <not found>
  *     last modfied: Mon Apr 11 16:10:19 2005
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/iop_sw_cfg_defs_asm.h ../../inst/io_proc/rtl/guinness/iop_sw_cfg.r
  *      id: $Id: iop_sw_cfg_defs_asm.h,v 1.5 2005/04/24 18:31:07 starvik Exp $
  * Any changes here will be lost.
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_sw_cpu_defs_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_sw_cpu_defs_asm.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_sw_cpu_defs_asm.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_sw_cpu_defs_asm.h	2005-04-24 20:31:07.000000000 +0200
@@ -6,7 +6,7 @@
  *   file:           ../../inst/io_proc/rtl/guinness/iop_sw_cpu.r
  *     id:           <not found>
  *     last modfied: Mon Apr 11 16:10:19 2005
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/iop_sw_cpu_defs_asm.h ../../inst/io_proc/rtl/guinness/iop_sw_cpu.r
  *      id: $Id: iop_sw_cpu_defs_asm.h,v 1.5 2005/04/24 18:31:07 starvik Exp $
  * Any changes here will be lost.
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_sw_mpu_defs_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_sw_mpu_defs_asm.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_sw_mpu_defs_asm.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_sw_mpu_defs_asm.h	2005-04-24 20:31:07.000000000 +0200
@@ -6,7 +6,7 @@
  *   file:           ../../inst/io_proc/rtl/guinness/iop_sw_mpu.r
  *     id:           <not found>
  *     last modfied: Mon Apr 11 16:10:19 2005
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/iop_sw_mpu_defs_asm.h ../../inst/io_proc/rtl/guinness/iop_sw_mpu.r
  *      id: $Id: iop_sw_mpu_defs_asm.h,v 1.5 2005/04/24 18:31:07 starvik Exp $
  * Any changes here will be lost.
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_sw_spu_defs_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_sw_spu_defs_asm.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_sw_spu_defs_asm.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_sw_spu_defs_asm.h	2005-04-24 20:31:07.000000000 +0200
@@ -6,7 +6,7 @@
  *   file:           ../../inst/io_proc/rtl/guinness/iop_sw_spu.r
  *     id:           <not found>
  *     last modfied: Mon Apr 11 16:10:19 2005
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/iop_sw_spu_defs_asm.h ../../inst/io_proc/rtl/guinness/iop_sw_spu.r
  *      id: $Id: iop_sw_spu_defs_asm.h,v 1.5 2005/04/24 18:31:07 starvik Exp $
  * Any changes here will be lost.
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_timer_grp_defs_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_timer_grp_defs_asm.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_timer_grp_defs_asm.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_timer_grp_defs_asm.h	2005-04-24 20:31:07.000000000 +0200
@@ -4,9 +4,9 @@
 /*
  * This file is autogenerated from
  *   file:           ../../inst/io_proc/rtl/iop_timer_grp.r
- *     id:           iop_timer_grp.r,v 1.29 2005/02/16 09:13:27 niklaspa Exp
+ *     id:           iop_timer_grp.r,v 1.29 2005/02/16 09:13:27 niklaspa Exp 
  *     last modfied: Mon Apr 11 16:08:46 2005
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/iop_timer_grp_defs_asm.h ../../inst/io_proc/rtl/iop_timer_grp.r
  *      id: $Id: iop_timer_grp_defs_asm.h,v 1.5 2005/04/24 18:31:07 starvik Exp $
  * Any changes here will be lost.
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_trigger_grp_defs_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_trigger_grp_defs_asm.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_trigger_grp_defs_asm.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_trigger_grp_defs_asm.h	2005-04-24 20:31:07.000000000 +0200
@@ -4,9 +4,9 @@
 /*
  * This file is autogenerated from
  *   file:           ../../inst/io_proc/rtl/iop_trigger_grp.r
- *     id:           iop_trigger_grp.r,v 0.20 2005/02/16 09:13:20 niklaspa Exp
+ *     id:           iop_trigger_grp.r,v 0.20 2005/02/16 09:13:20 niklaspa Exp 
  *     last modfied: Mon Apr 11 16:08:46 2005
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/iop_trigger_grp_defs_asm.h ../../inst/io_proc/rtl/iop_trigger_grp.r
  *      id: $Id: iop_trigger_grp_defs_asm.h,v 1.5 2005/04/24 18:31:07 starvik Exp $
  * Any changes here will be lost.
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_version_defs_asm.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_version_defs_asm.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/asm/iop_version_defs_asm.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/asm/iop_version_defs_asm.h	2005-04-24 20:31:07.000000000 +0200
@@ -4,9 +4,9 @@
 /*
  * This file is autogenerated from
  *   file:           ../../inst/io_proc/rtl/guinness/iop_version.r
- *     id:           iop_version.r,v 1.3 2004/04/22 12:37:54 jonaso Exp
+ *     id:           iop_version.r,v 1.3 2004/04/22 12:37:54 jonaso Exp 
  *     last modfied: Mon Apr 11 16:08:44 2005
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c -asm --outfile asm/iop_version_defs_asm.h ../../inst/io_proc/rtl/guinness/iop_version.r
  *      id: $Id: iop_version_defs_asm.h,v 1.5 2005/04/24 18:31:07 starvik Exp $
  * Any changes here will be lost.
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_crc_par_defs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_crc_par_defs.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_crc_par_defs.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_crc_par_defs.h	2005-04-24 20:31:05.000000000 +0200
@@ -6,7 +6,7 @@
  *   file:           ../../inst/io_proc/rtl/iop_crc_par.r
  *     id:           <not found>
  *     last modfied: Mon Apr 11 16:08:45 2005
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c --outfile iop_crc_par_defs.h ../../inst/io_proc/rtl/iop_crc_par.r
  *      id: $Id: iop_crc_par_defs.h,v 1.5 2005/04/24 18:31:05 starvik Exp $
  * Any changes here will be lost.
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_dmc_in_defs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_dmc_in_defs.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_dmc_in_defs.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_dmc_in_defs.h	2005-04-24 20:31:05.000000000 +0200
@@ -4,9 +4,9 @@
 /*
  * This file is autogenerated from
  *   file:           ../../inst/io_proc/rtl/iop_dmc_in.r
- *     id:           iop_dmc_in.r,v 1.26 2005/02/16 09:14:17 niklaspa Exp
+ *     id:           iop_dmc_in.r,v 1.26 2005/02/16 09:14:17 niklaspa Exp 
  *     last modfied: Mon Apr 11 16:08:45 2005
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c --outfile iop_dmc_in_defs.h ../../inst/io_proc/rtl/iop_dmc_in.r
  *      id: $Id: iop_dmc_in_defs.h,v 1.5 2005/04/24 18:31:05 starvik Exp $
  * Any changes here will be lost.
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_dmc_out_defs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_dmc_out_defs.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_dmc_out_defs.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_dmc_out_defs.h	2005-04-24 20:31:05.000000000 +0200
@@ -4,9 +4,9 @@
 /*
  * This file is autogenerated from
  *   file:           ../../inst/io_proc/rtl/iop_dmc_out.r
- *     id:           iop_dmc_out.r,v 1.30 2005/02/16 09:14:11 niklaspa Exp
+ *     id:           iop_dmc_out.r,v 1.30 2005/02/16 09:14:11 niklaspa Exp 
  *     last modfied: Mon Apr 11 16:08:45 2005
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c --outfile iop_dmc_out_defs.h ../../inst/io_proc/rtl/iop_dmc_out.r
  *      id: $Id: iop_dmc_out_defs.h,v 1.5 2005/04/24 18:31:05 starvik Exp $
  * Any changes here will be lost.
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_fifo_in_defs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_fifo_in_defs.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_fifo_in_defs.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_fifo_in_defs.h	2005-04-24 20:31:05.000000000 +0200
@@ -6,7 +6,7 @@
  *   file:           ../../inst/io_proc/rtl/iop_fifo_in.r
  *     id:           <not found>
  *     last modfied: Mon Apr 11 16:10:07 2005
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c --outfile iop_fifo_in_defs.h ../../inst/io_proc/rtl/iop_fifo_in.r
  *      id: $Id: iop_fifo_in_defs.h,v 1.4 2005/04/24 18:31:05 starvik Exp $
  * Any changes here will be lost.
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_fifo_in_extra_defs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_fifo_in_extra_defs.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_fifo_in_extra_defs.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_fifo_in_extra_defs.h	2005-04-24 20:31:05.000000000 +0200
@@ -6,7 +6,7 @@
  *   file:           ../../inst/io_proc/rtl/iop_fifo_in_extra.r
  *     id:           <not found>
  *     last modfied: Mon Apr 11 16:10:08 2005
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c --outfile iop_fifo_in_extra_defs.h ../../inst/io_proc/rtl/iop_fifo_in_extra.r
  *      id: $Id: iop_fifo_in_extra_defs.h,v 1.1 2005/04/24 18:31:05 starvik Exp $
  * Any changes here will be lost.
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_fifo_out_defs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_fifo_out_defs.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_fifo_out_defs.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_fifo_out_defs.h	2005-04-24 20:31:05.000000000 +0200
@@ -6,7 +6,7 @@
  *   file:           ../../inst/io_proc/rtl/iop_fifo_out.r
  *     id:           <not found>
  *     last modfied: Mon Apr 11 16:10:09 2005
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c --outfile iop_fifo_out_defs.h ../../inst/io_proc/rtl/iop_fifo_out.r
  *      id: $Id: iop_fifo_out_defs.h,v 1.4 2005/04/24 18:31:05 starvik Exp $
  * Any changes here will be lost.
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_fifo_out_extra_defs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_fifo_out_extra_defs.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_fifo_out_extra_defs.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_fifo_out_extra_defs.h	2005-04-24 20:31:05.000000000 +0200
@@ -6,7 +6,7 @@
  *   file:           ../../inst/io_proc/rtl/iop_fifo_out_extra.r
  *     id:           <not found>
  *     last modfied: Mon Apr 11 16:10:10 2005
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c --outfile iop_fifo_out_extra_defs.h ../../inst/io_proc/rtl/iop_fifo_out_extra.r
  *      id: $Id: iop_fifo_out_extra_defs.h,v 1.1 2005/04/24 18:31:05 starvik Exp $
  * Any changes here will be lost.
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_mpu_defs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_mpu_defs.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_mpu_defs.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_mpu_defs.h	2005-04-24 20:31:05.000000000 +0200
@@ -4,9 +4,9 @@
 /*
  * This file is autogenerated from
  *   file:           ../../inst/io_proc/rtl/iop_mpu.r
- *     id:           iop_mpu.r,v 1.30 2005/02/17 08:12:33 niklaspa Exp
+ *     id:           iop_mpu.r,v 1.30 2005/02/17 08:12:33 niklaspa Exp 
  *     last modfied: Mon Apr 11 16:08:45 2005
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c --outfile iop_mpu_defs.h ../../inst/io_proc/rtl/iop_mpu.r
  *      id: $Id: iop_mpu_defs.h,v 1.5 2005/04/24 18:31:05 starvik Exp $
  * Any changes here will be lost.
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_mpu_macros.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_mpu_macros.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_mpu_macros.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_mpu_macros.h	2004-01-07 16:18:30.000000000 +0100
@@ -96,189 +96,189 @@
 #define MPU_ADD_RRR(S,N,D) (0x4000008C | ((S & ((1 << 5) - 1)) << 16)\
                                 | ((N & ((1 << 5) - 1)) << 11)\
                                 | ((D & ((1 << 5) - 1)) << 21))
-
+                               
 #define MPU_ADD_RRS(S,N,D) (0x4000048C | ((S & ((1 << 5) - 1)) << 16)\
                                 | ((N & ((1 << 5) - 1)) << 11)\
                                 | ((D & ((1 << 5) - 1)) << 21))
-
+                               
 #define MPU_ADD_RSR(S,N,D) (0x4000018C | ((S & ((1 << 5) - 1)) << 16)\
                                 | ((N & ((1 << 5) - 1)) << 11)\
                                 | ((D & ((1 << 5) - 1)) << 21))
-
+                               
 #define MPU_ADD_RSS(S,N,D) (0x4000058C | ((S & ((1 << 5) - 1)) << 16)\
                                 | ((N & ((1 << 5) - 1)) << 11)\
                                 | ((D & ((1 << 5) - 1)) << 21))
-
+                               
 #define MPU_ADD_SRR(S,N,D) (0x4000028C | ((S & ((1 << 5) - 1)) << 16)\
                                 | ((N & ((1 << 5) - 1)) << 11)\
                                 | ((D & ((1 << 5) - 1)) << 21))
-
+                               
 #define MPU_ADD_SRS(S,N,D) (0x4000068C | ((S & ((1 << 5) - 1)) << 16)\
                                 | ((N & ((1 << 5) - 1)) << 11)\
                                 | ((D & ((1 << 5) - 1)) << 21))
-
+                               
 #define MPU_ADD_SSR(S,N,D) (0x4000038C | ((S & ((1 << 5) - 1)) << 16)\
                                 | ((N & ((1 << 5) - 1)) << 11)\
                                 | ((D & ((1 << 5) - 1)) << 21))
-
+                               
 #define MPU_ADD_SSS(S,N,D) (0x4000078C | ((S & ((1 << 5) - 1)) << 16)\
                                 | ((N & ((1 << 5) - 1)) << 11)\
                                 | ((D & ((1 << 5) - 1)) << 21))
-
+                               
 #define MPU_ADDQ_RIR(S,N,D) (0x10000000 | ((S & ((1 << 5) - 1)) << 16)\
                                  | ((N & ((1 << 16) - 1)) << 0)\
                                  | ((D & ((1 << 5) - 1)) << 21))
-
+                                
 #define MPU_ADDQ_IRR(S,N,D) (0x10000000 | ((S & ((1 << 16) - 1)) << 0)\
                                  | ((N & ((1 << 5) - 1)) << 16)\
                                  | ((D & ((1 << 5) - 1)) << 21))
-
+                                
 #define MPU_ADDX_IRR_INSTR(S,N,D) (0xC000008C | ((N & ((1 << 5) - 1)) << 16)\
                                        | ((D & ((1 << 5) - 1)) << 21))
-
+                                      
 #define MPU_ADDX_IRR_IMM(S,N,D) (S & 0xFFFFFFFF)
 
 #define MPU_ADDX_RIR_INSTR(S,N,D) (0xC000008C | ((S & ((1 << 5) - 1)) << 16)\
                                        | ((D & ((1 << 5) - 1)) << 21))
-
+                                      
 #define MPU_ADDX_RIR_IMM(S,N,D) (N & 0xFFFFFFFF)
 
 #define MPU_ADDX_ISR_INSTR(S,N,D) (0xC000028C | ((N & ((1 << 5) - 1)) << 16)\
                                        | ((D & ((1 << 5) - 1)) << 21))
-
+                                      
 #define MPU_ADDX_ISR_IMM(S,N,D) (S & 0xFFFFFFFF)
 
 #define MPU_ADDX_SIR_INSTR(S,N,D) (0xC000028C | ((S & ((1 << 5) - 1)) << 16)\
                                        | ((D & ((1 << 5) - 1)) << 21))
-
+                                      
 #define MPU_ADDX_SIR_IMM(S,N,D) (N & 0xFFFFFFFF)
 
 #define MPU_ADDX_IRS_INSTR(S,N,D) (0xC000048C | ((N & ((1 << 5) - 1)) << 16)\
                                        | ((D & ((1 << 5) - 1)) << 21))
-
+                                      
 #define MPU_ADDX_IRS_IMM(S,N,D) (S & 0xFFFFFFFF)
 
 #define MPU_ADDX_RIS_INSTR(S,N,D) (0xC000048C | ((S & ((1 << 5) - 1)) << 16)\
                                        | ((D & ((1 << 5) - 1)) << 21))
-
+                                      
 #define MPU_ADDX_RIS_IMM(S,N,D) (N & 0xFFFFFFFF)
 
 #define MPU_ADDX_ISS_INSTR(S,N,D) (0xC000068C | ((N & ((1 << 5) - 1)) << 16)\
                                        | ((D & ((1 << 5) - 1)) << 21))
-
+                                      
 #define MPU_ADDX_ISS_IMM(S,N,D) (S & 0xFFFFFFFF)
 
 #define MPU_ADDX_SIS_INSTR(S,N,D) (0xC000068C | ((S & ((1 << 5) - 1)) << 16)\
                                        | ((D & ((1 << 5) - 1)) << 21))
-
+                                      
 #define MPU_ADDX_SIS_IMM(S,N,D) (N & 0xFFFFFFFF)
 
 #define MPU_AND_RRR(S,N,D) (0x4000008A | ((S & ((1 << 5) - 1)) << 16)\
                                 | ((N & ((1 << 5) - 1)) << 11)\
                                 | ((D & ((1 << 5) - 1)) << 21))
-
+                               
 #define MPU_AND_RRS(S,N,D) (0x4000048A | ((S & ((1 << 5) - 1)) << 16)\
                                 | ((N & ((1 << 5) - 1)) << 11)\
                                 | ((D & ((1 << 5) - 1)) << 21))
-
+                               
 #define MPU_AND_RSR(S,N,D) (0x4000018A | ((S & ((1 << 5) - 1)) << 16)\
                                 | ((N & ((1 << 5) - 1)) << 11)\
                                 | ((D & ((1 << 5) - 1)) << 21))
-
+                               
 #define MPU_AND_RSS(S,N,D) (0x4000058A | ((S & ((1 << 5) - 1)) << 16)\
                                 | ((N & ((1 << 5) - 1)) << 11)\
                                 | ((D & ((1 << 5) - 1)) << 21))
-
+                               
 #define MPU_AND_SRR(S,N,D) (0x4000028A | ((S & ((1 << 5) - 1)) << 16)\
                                 | ((N & ((1 << 5) - 1)) << 11)\
                                 | ((D & ((1 << 5) - 1)) << 21))
-
+                               
 #define MPU_AND_SRS(S,N,D) (0x4000068A | ((S & ((1 << 5) - 1)) << 16)\
                                 | ((N & ((1 << 5) - 1)) << 11)\
                                 | ((D & ((1 << 5) - 1)) << 21))
-
+                               
 #define MPU_AND_SSR(S,N,D) (0x4000038A | ((S & ((1 << 5) - 1)) << 16)\
                                 | ((N & ((1 << 5) - 1)) << 11)\
                                 | ((D & ((1 << 5) - 1)) << 21))
-
+                               
 #define MPU_AND_SSS(S,N,D) (0x4000078A | ((S & ((1 << 5) - 1)) << 16)\
                                 | ((N & ((1 << 5) - 1)) << 11)\
                                 | ((D & ((1 << 5) - 1)) << 21))
-
+                               
 #define MPU_ANDQ_RIR(S,N,D) (0x08000000 | ((S & ((1 << 5) - 1)) << 16)\
                                  | ((N & ((1 << 16) - 1)) << 0)\
                                  | ((D & ((1 << 5) - 1)) << 21))
-
+                                
 #define MPU_ANDQ_IRR(S,N,D) (0x08000000 | ((S & ((1 << 16) - 1)) << 0)\
                                  | ((N & ((1 << 5) - 1)) << 16)\
                                  | ((D & ((1 << 5) - 1)) << 21))
-
+                                
 #define MPU_ANDX_RIR_INSTR(S,N,D) (0xC000008A | ((S & ((1 << 5) - 1)) << 16)\
                                        | ((D & ((1 << 5) - 1)) << 21))
-
+                                      
 #define MPU_ANDX_RIR_IMM(S,N,D) (N & 0xFFFFFFFF)
 
 #define MPU_ANDX_IRR_INSTR(S,N,D) (0xC000008A | ((N & ((1 << 5) - 1)) << 16)\
                                        | ((D & ((1 << 5) - 1)) << 21))
-
+                                      
 #define MPU_ANDX_IRR_IMM(S,N,D) (S & 0xFFFFFFFF)
 
 #define MPU_ANDX_ISR_INSTR(S,N,D) (0xC000028A | ((N & ((1 << 5) - 1)) << 16)\
                                        | ((D & ((1 << 5) - 1)) << 21))
-
+                                      
 #define MPU_ANDX_ISR_IMM(S,N,D) (S & 0xFFFFFFFF)
 
 #define MPU_ANDX_SIR_INSTR(S,N,D) (0xC000028A | ((S & ((1 << 5) - 1)) << 16)\
                                        | ((D & ((1 << 5) - 1)) << 21))
-
+                                      
 #define MPU_ANDX_SIR_IMM(S,N,D) (N & 0xFFFFFFFF)
 
 #define MPU_ANDX_IRS_INSTR(S,N,D) (0xC000048A | ((N & ((1 << 5) - 1)) << 16)\
                                        | ((D & ((1 << 5) - 1)) << 21))
-
+                                      
 #define MPU_ANDX_IRS_IMM(S,N,D) (S & 0xFFFFFFFF)
 
 #define MPU_ANDX_ISS_INSTR(S,N,D) (0xC000068A | ((N & ((1 << 5) - 1)) << 16)\
                                        | ((D & ((1 << 5) - 1)) << 21))
-
+                                      
 #define MPU_ANDX_ISS_IMM(S,N,D) (S & 0xFFFFFFFF)
 
 #define MPU_ANDX_RIS_INSTR(S,N,D) (0xC000048A | ((S & ((1 << 5) - 1)) << 16)\
                                        | ((D & ((1 << 5) - 1)) << 21))
-
+                                      
 #define MPU_ANDX_RIS_IMM(S,N,D) (N & 0xFFFFFFFF)
 
 #define MPU_ANDX_SIS_INSTR(S,N,D) (0xC000068A | ((S & ((1 << 5) - 1)) << 16)\
                                        | ((D & ((1 << 5) - 1)) << 21))
-
+                                      
 #define MPU_ANDX_SIS_IMM(S,N,D) (N & 0xFFFFFFFF)
 
 #define MPU_BA_I(S) (0x60000000 | ((S & ((1 << 16) - 1)) << 0))
-
+                        
 #define MPU_BAR_R(S) (0x62000000 | ((S & ((1 << 5) - 1)) << 11))
-
+                         
 #define MPU_BAR_S(S) (0x63000000 | ((S & ((1 << 5) - 1)) << 11))
-
+                         
 #define MPU_BBC_RII(S,N,D) (0x78000000 | ((S & ((1 << 5) - 1)) << 16)\
                                 | ((N & ((1 << 5) - 1)) << 21)\
                                 | ((D & ((1 << 16) - 1)) << 0))
-
+                               
 #define MPU_BBS_RII(S,N,D) (0x7C000000 | ((S & ((1 << 5) - 1)) << 16)\
                                 | ((N & ((1 << 5) - 1)) << 21)\
                                 | ((D & ((1 << 16) - 1)) << 0))
-
+                               
 #define MPU_BNZ_RI(S,D) (0x74400000 | ((S & ((1 << 5) - 1)) << 16)\
                              | ((D & ((1 << 16) - 1)) << 0))
-
+                            
 #define MPU_BMI_RI(S,D) (0x7FE00000 | ((S & ((1 << 5) - 1)) << 16)\
                              | ((D & ((1 << 16) - 1)) << 0))
-
+                            
 #define MPU_BPL_RI(S,D) (0x7BE00000 | ((S & ((1 << 5) - 1)) << 16)\
                              | ((D & ((1 << 16) - 1)) << 0))
-
+                            
 #define MPU_BZ_RI(S,D) (0x74000000 | ((S & ((1 << 5) - 1)) << 16)\
                             | ((D & ((1 << 16) - 1)) << 0))
-
+                           
 #define MPU_DI() (0x40000001)
 
 #define MPU_EI() (0x40000003)
@@ -286,243 +286,243 @@
 #define MPU_HALT() (0x40000002)
 
 #define MPU_JIR_I(S) (0x60200000 | ((S & ((1 << 16) - 1)) << 0))
-
+                         
 #define MPU_JIR_R(S) (0x62200000 | ((S & ((1 << 5) - 1)) << 11))
-
+                         
 #define MPU_JIR_S(S) (0x63200000 | ((S & ((1 << 5) - 1)) << 11))
-
+                         
 #define MPU_JNT() (0x61000000)
 
 #define MPU_JSR_I(S) (0x60400000 | ((S & ((1 << 16) - 1)) << 0))
-
+                         
 #define MPU_JSR_R(S) (0x62400000 | ((S & ((1 << 5) - 1)) << 11))
-
+                         
 #define MPU_JSR_S(S) (0x63400000 | ((S & ((1 << 5) - 1)) << 11))
-
+                         
 #define MPU_LSL_RRR(S,N,D) (0x4000008E | ((S & ((1 << 5) - 1)) << 16)\
                                 | ((N & ((1 << 5) - 1)) << 11)\
                                 | ((D & ((1 << 5) - 1)) << 21))
-
+                               
 #define MPU_LSL_RRS(S,N,D) (0x4000048E | ((S & ((1 << 5) - 1)) << 16)\
                                 | ((N & ((1 << 5) - 1)) << 11)\
                                 | ((D & ((1 << 5) - 1)) << 21))
-
+                               
 #define MPU_LSL_RSR(S,N,D) (0x4000018E | ((S & ((1 << 5) - 1)) << 16)\
                                 | ((N & ((1 << 5) - 1)) << 11)\
                                 | ((D & ((1 << 5) - 1)) << 21))
-
+                               
 #define MPU_LSL_RSS(S,N,D) (0x4000058E | ((S & ((1 << 5) - 1)) << 16)\
                                 | ((N & ((1 << 5) - 1)) << 11)\
                                 | ((D & ((1 << 5) - 1)) << 21))
-
+                               
 #define MPU_LSL_SRR(S,N,D) (0x4000028E | ((S & ((1 << 5) - 1)) << 16)\
                                 | ((N & ((1 << 5) - 1)) << 11)\
                                 | ((D & ((1 << 5) - 1)) << 21))
-
+                               
 #define MPU_LSL_SRS(S,N,D) (0x4000068E | ((S & ((1 << 5) - 1)) << 16)\
                                 | ((N & ((1 << 5) - 1)) << 11)\
                                 | ((D & ((1 << 5) - 1)) << 21))
-
+                               
 #define MPU_LSL_SSR(S,N,D) (0x4000038E | ((S & ((1 << 5) - 1)) << 16)\
                                 | ((N & ((1 << 5) - 1)) << 11)\
                                 | ((D & ((1 << 5) - 1)) << 21))
-
+                               
 #define MPU_LSL_SSS(S,N,D) (0x4000078E | ((S & ((1 << 5) - 1)) << 16)\
                                 | ((N & ((1 << 5) - 1)) << 11)\
                                 | ((D & ((1 << 5) - 1)) << 21))
-
+                               
 #define MPU_LSLQ_RIR(S,N,D) (0x18000000 | ((S & ((1 << 5) - 1)) << 16)\
                                  | ((N & ((1 << 16) - 1)) << 0)\
                                  | ((D & ((1 << 5) - 1)) << 21))
-
+                                
 #define MPU_LSR_RRR(S,N,D) (0x4000008F | ((S & ((1 << 5) - 1)) << 16)\
                                 | ((N & ((1 << 5) - 1)) << 11)\
                                 | ((D & ((1 << 5) - 1)) << 21))
-
+                               
 #define MPU_LSR_RRS(S,N,D) (0x4000048F | ((S & ((1 << 5) - 1)) << 16)\
                                 | ((N & ((1 << 5) - 1)) << 11)\
                                 | ((D & ((1 << 5) - 1)) << 21))
-
+                               
 #define MPU_LSR_RSR(S,N,D) (0x4000018F | ((S & ((1 << 5) - 1)) << 16)\
                                 | ((N & ((1 << 5) - 1)) << 11)\
                                 | ((D & ((1 << 5) - 1)) << 21))
-
+                               
 #define MPU_LSR_RSS(S,N,D) (0x4000058F | ((S & ((1 << 5) - 1)) << 16)\
                                 | ((N & ((1 << 5) - 1)) << 11)\
                                 | ((D & ((1 << 5) - 1)) << 21))
-
+                               
 #define MPU_LSR_SRR(S,N,D) (0x4000028F | ((S & ((1 << 5) - 1)) << 16)\
                                 | ((N & ((1 << 5) - 1)) << 11)\
                                 | ((D & ((1 << 5) - 1)) << 21))
-
+                               
 #define MPU_LSR_SRS(S,N,D) (0x4000068F | ((S & ((1 << 5) - 1)) << 16)\
                                 | ((N & ((1 << 5) - 1)) << 11)\
                                 | ((D & ((1 << 5) - 1)) << 21))
-
+                               
 #define MPU_LSR_SSR(S,N,D) (0x4000038F | ((S & ((1 << 5) - 1)) << 16)\
                                 | ((N & ((1 << 5) - 1)) << 11)\
                                 | ((D & ((1 << 5) - 1)) << 21))
-
+                               
 #define MPU_LSR_SSS(S,N,D) (0x4000078F | ((S & ((1 << 5) - 1)) << 16)\
                                 | ((N & ((1 << 5) - 1)) << 11)\
                                 | ((D & ((1 << 5) - 1)) << 21))
-
+                               
 #define MPU_LSRQ_RIR(S,N,D) (0x1C000000 | ((S & ((1 << 5) - 1)) << 16)\
                                  | ((N & ((1 << 16) - 1)) << 0)\
                                  | ((D & ((1 << 5) - 1)) << 21))
-
+                                
 #define MPU_LW_IR(S,D) (0x64400000 | ((S & ((1 << 16) - 1)) << 0)\
                             | ((D & ((1 << 5) - 1)) << 16))
-
+                           
 #define MPU_LW_IS(S,D) (0x64600000 | ((S & ((1 << 16) - 1)) << 0)\
                             | ((D & ((1 << 5) - 1)) << 16))
-
+                           
 #define MPU_LW_RR(S,D) (0x66400000 | ((S & ((1 << 5) - 1)) << 11)\
                             | ((D & ((1 << 5) - 1)) << 16))
-
+                           
 #define MPU_LW_RS(S,D) (0x66600000 | ((S & ((1 << 5) - 1)) << 11)\
                             | ((D & ((1 << 5) - 1)) << 16))
-
+                           
 #define MPU_LW_SR(S,D) (0x67400000 | ((S & ((1 << 5) - 1)) << 11)\
                             | ((D & ((1 << 5) - 1)) << 16))
-
+                           
 #define MPU_LW_SS(S,D) (0x67600000 | ((S & ((1 << 5) - 1)) << 11)\
                             | ((D & ((1 << 5) - 1)) << 16))
-
+                           
 #define MPU_LW_RIR(S,N,D) (0x66400000 | ((S & ((1 << 5) - 1)) << 11)\
                                | ((N & ((1 << 8) - 1)) << 0)\
                                | ((D & ((1 << 5) - 1)) << 16))
-
+                              
 #define MPU_LW_RIS(S,N,D) (0x66600000 | ((S & ((1 << 5) - 1)) << 11)\
                                | ((N & ((1 << 8) - 1)) << 0)\
                                | ((D & ((1 << 5) - 1)) << 16))
-
+                              
 #define MPU_LW_SIR(S,N,D) (0x67400000 | ((S & ((1 << 5) - 1)) << 11)\
                                | ((N & ((1 << 8) - 1)) << 0)\
                                | ((D & ((1 << 5) - 1)) << 16))
-
+                              
 #define MPU_LW_SIS(S,N,D) (0x67600000 | ((S & ((1 << 5) - 1)) << 11)\
                                | ((N & ((1 << 8) - 1)) << 0)\
                                | ((D & ((1 << 5) - 1)) << 16))
-
+                              
 #define MPU_MOVE_RR(S,D) (0x40000081 | ((S & ((1 << 5) - 1)) << 11)\
                               | ((D & ((1 << 5) - 1)) << 21))
-
+                             
 #define MPU_MOVE_RS(S,D) (0x40000481 | ((S & ((1 << 5) - 1)) << 11)\
                               | ((D & ((1 << 5) - 1)) << 21))
-
+                             
 #define MPU_MOVE_SR(S,D) (0x40000181 | ((S & ((1 << 5) - 1)) << 11)\
                               | ((D & ((1 << 5) - 1)) << 21))
-
+                             
 #define MPU_MOVE_SS(S,D) (0x40000581 | ((S & ((1 << 5) - 1)) << 11)\
                               | ((D & ((1 << 5) - 1)) << 21))
-
+                             
 #define MPU_MOVEQ_IR(S,D) (0x24000000 | ((S & ((1 << 16) - 1)) << 0)\
                                | ((D & ((1 << 5) - 1)) << 21))
-
+                              
 #define MPU_MOVEQ_IS(S,D) (0x2C000000 | ((S & ((1 << 16) - 1)) << 0)\
                                | ((D & ((1 << 5) - 1)) << 21))
-
+                              
 #define MPU_MOVEX_IR_INSTR(S,D) (0xC0000081 | ((D & ((1 << 5) - 1)) << 21))
-
+                                    
 #define MPU_MOVEX_IR_IMM(S,D) (S & 0xFFFFFFFF)
 
 #define MPU_MOVEX_IS_INSTR(S,D) (0xC0000481 | ((D & ((1 << 5) - 1)) << 21))
-
+                                    
 #define MPU_MOVEX_IS_IMM(S,D) (S & 0xFFFFFFFF)
 
 #define MPU_NOP() (0x40000000)
 
 #define MPU_NOT_RR(S,D) (0x40100081 | ((S & ((1 << 5) - 1)) << 11)\
                              | ((D & ((1 << 5) - 1)) << 21))
-
+                            
 #define MPU_NOT_RS(S,D) (0x40100481 | ((S & ((1 << 5) - 1)) << 11)\
                              | ((D & ((1 << 5) - 1)) << 21))
-
+                            
 #define MPU_NOT_SR(S,D) (0x40100181 | ((S & ((1 << 5) - 1)) << 11)\
                              | ((D & ((1 << 5) - 1)) << 21))
-
+                            
 #define MPU_NOT_SS(S,D) (0x40100581 | ((S & ((1 << 5) - 1)) << 11)\
                              | ((D & ((1 << 5) - 1)) << 21))
-
+                            
 #define MPU_OR_RRR(S,N,D) (0x4000008B | ((S & ((1 << 5) - 1)) << 16)\
                                | ((N & ((1 << 5) - 1)) << 11)\
                                | ((D & ((1 << 5) - 1)) << 21))
-
+                              
 #define MPU_OR_RRS(S,N,D) (0x4000048B | ((S & ((1 << 5) - 1)) << 16)\
                                | ((N & ((1 << 5) - 1)) << 11)\
                                | ((D & ((1 << 5) - 1)) << 21))
-
+                              
 #define MPU_OR_RSR(S,N,D) (0x4000018B | ((S & ((1 << 5) - 1)) << 16)\
                                | ((N & ((1 << 5) - 1)) << 11)\
                                | ((D & ((1 << 5) - 1)) << 21))
-
+                              
 #define MPU_OR_RSS(S,N,D) (0x4000058B | ((S & ((1 << 5) - 1)) << 16)\
                                | ((N & ((1 << 5) - 1)) << 11)\
                                | ((D & ((1 << 5) - 1)) << 21))
-
+                              
 #define MPU_OR_SRR(S,N,D) (0x4000028B | ((S & ((1 << 5) - 1)) << 16)\
                                | ((N & ((1 << 5) - 1)) << 11)\
                                | ((D & ((1 << 5) - 1)) << 21))
-
+                              
 #define MPU_OR_SRS(S,N,D) (0x4000068B | ((S & ((1 << 5) - 1)) << 16)\
                                | ((N & ((1 << 5) - 1)) << 11)\
                                | ((D & ((1 << 5) - 1)) << 21))
-
+                              
 #define MPU_OR_SSR(S,N,D) (0x4000038B | ((S & ((1 << 5) - 1)) << 16)\
                                | ((N & ((1 << 5) - 1)) << 11)\
                                | ((D & ((1 << 5) - 1)) << 21))
-
+                              
 #define MPU_OR_SSS(S,N,D) (0x4000078B | ((S & ((1 << 5) - 1)) << 16)\
                                | ((N & ((1 << 5) - 1)) << 11)\
                                | ((D & ((1 << 5) - 1)) << 21))
-
+                              
 #define MPU_ORQ_RIR(S,N,D) (0x0C000000 | ((S & ((1 << 5) - 1)) << 16)\
                                 | ((N & ((1 << 16) - 1)) << 0)\
                                 | ((D & ((1 << 5) - 1)) << 21))
-
+                               
 #define MPU_ORQ_IRR(S,N,D) (0x0C000000 | ((S & ((1 << 16) - 1)) << 0)\
                                 | ((N & ((1 << 5) - 1)) << 16)\
                                 | ((D & ((1 << 5) - 1)) << 21))
-
+                               
 #define MPU_ORX_RIR_INSTR(S,N,D) (0xC000008B | ((S & ((1 << 5) - 1)) << 16)\
                                       | ((D & ((1 << 5) - 1)) << 21))
-
+                                     
 #define MPU_ORX_RIR_IMM(S,N,D) (N & 0xFFFFFFFF)
 
 #define MPU_ORX_IRR_INSTR(S,N,D) (0xC000008B | ((N & ((1 << 5) - 1)) << 16)\
                                       | ((D & ((1 << 5) - 1)) << 21))
-
+                                     
 #define MPU_ORX_IRR_IMM(S,N,D) (S & 0xFFFFFFFF)
 
 #define MPU_ORX_SIR_INSTR(S,N,D) (0xC000028B | ((S & ((1 << 5) - 1)) << 16)\
                                       | ((D & ((1 << 5) - 1)) << 21))
-
+                                     
 #define MPU_ORX_SIR_IMM(S,N,D) (N & 0xFFFFFFFF)
 
 #define MPU_ORX_ISR_INSTR(S,N,D) (0xC000028B | ((N & ((1 << 5) - 1)) << 16)\
                                       | ((D & ((1 << 5) - 1)) << 21))
-
+                                     
 #define MPU_ORX_ISR_IMM(S,N,D) (S & 0xFFFFFFFF)
 
 #define MPU_ORX_RIS_INSTR(S,N,D) (0xC000048B | ((S & ((1 << 5) - 1)) << 16)\
                                       | ((D & ((1 << 5) - 1)) << 21))
-
+                                     
 #define MPU_ORX_RIS_IMM(S,N,D) (N & 0xFFFFFFFF)
 
 #define MPU_ORX_IRS_INSTR(S,N,D) (0xC000048B | ((N & ((1 << 5) - 1)) << 16)\
                                       | ((D & ((1 << 5) - 1)) << 21))
-
+                                     
 #define MPU_ORX_IRS_IMM(S,N,D) (S & 0xFFFFFFFF)
 
 #define MPU_ORX_SIS_INSTR(S,N,D) (0xC000068B | ((S & ((1 << 5) - 1)) << 16)\
                                       | ((D & ((1 << 5) - 1)) << 21))
-
+                                     
 #define MPU_ORX_SIS_IMM(S,N,D) (N & 0xFFFFFFFF)
 
 #define MPU_ORX_ISS_INSTR(S,N,D) (0xC000068B | ((N & ((1 << 5) - 1)) << 16)\
                                       | ((D & ((1 << 5) - 1)) << 21))
-
+                                     
 #define MPU_ORX_ISS_IMM(S,N,D) (S & 0xFFFFFFFF)
 
 #define MPU_RET() (0x63003000)
@@ -531,232 +531,232 @@
 
 #define MPU_RR_IR(S,D) (0x50000000 | ((S & ((1 << 11) - 1)) << 0)\
                             | ((D & ((1 << 5) - 1)) << 21))
-
+                           
 #define MPU_RR_SR(S,D) (0x50008000 | ((S & ((1 << 5) - 1)) << 16)\
                             | ((D & ((1 << 5) - 1)) << 21))
-
+                           
 #define MPU_RW_RI(S,D) (0x56000000 | ((S & ((1 << 5) - 1)) << 11)\
                             | ((D & ((1 << 11) - 1)) << 0))
-
+                           
 #define MPU_RW_RS(S,D) (0x57000000 | ((S & ((1 << 5) - 1)) << 11)\
                             | ((D & ((1 << 5) - 1)) << 16))
-
+                           
 #define MPU_RWQ_II(S,D) (0x58000000 | ((S & ((1 << 16) - 1)) << 11)\
                              | ((D & ((1 << 11) - 1)) << 0))
-
+                            
 #define MPU_RWQ_IS(S,D) (0x55000000 | ((S & ((1 << 16) - 1)) << 0)\
                              | ((D & ((1 << 5) - 1)) << 16))
-
+                            
 #define MPU_RWX_II_INSTR(S,D) (0xD4000000 | ((D & ((1 << 11) - 1)) << 0))
-
+                                  
 #define MPU_RWX_II_IMM(S,D) (S & 0xFFFFFFFF)
 
 #define MPU_RWX_IS_INSTR(S,D) (0xD5000000 | ((D & ((1 << 5) - 1)) << 16))
-
+                                  
 #define MPU_RWX_IS_IMM(S,D) (S & 0xFFFFFFFF)
 
 #define MPU_SUB_RRR(S,N,D) (0x4000008D | ((S & ((1 << 5) - 1)) << 16)\
                                 | ((N & ((1 << 5) - 1)) << 11)\
                                 | ((D & ((1 << 5) - 1)) << 21))
-
+                               
 #define MPU_SUB_RRS(S,N,D) (0x4000048D | ((S & ((1 << 5) - 1)) << 16)\
                                 | ((N & ((1 << 5) - 1)) << 11)\
                                 | ((D & ((1 << 5) - 1)) << 21))
-
+                               
 #define MPU_SUB_RSR(S,N,D) (0x4000018D | ((S & ((1 << 5) - 1)) << 16)\
                                 | ((N & ((1 << 5) - 1)) << 11)\
                                 | ((D & ((1 << 5) - 1)) << 21))
-
+                               
 #define MPU_SUB_RSS(S,N,D) (0x4000058D | ((S & ((1 << 5) - 1)) << 16)\
                                 | ((N & ((1 << 5) - 1)) << 11)\
                                 | ((D & ((1 << 5) - 1)) << 21))
-
+                               
 #define MPU_SUB_SRR(S,N,D) (0x4000028D | ((S & ((1 << 5) - 1)) << 16)\
                                 | ((N & ((1 << 5) - 1)) << 11)\
                                 | ((D & ((1 << 5) - 1)) << 21))
-
+                               
 #define MPU_SUB_SRS(S,N,D) (0x4000068D | ((S & ((1 << 5) - 1)) << 16)\
                                 | ((N & ((1 << 5) - 1)) << 11)\
                                 | ((D & ((1 << 5) - 1)) << 21))
-
+                               
 #define MPU_SUB_SSR(S,N,D) (0x4000038D | ((S & ((1 << 5) - 1)) << 16)\
                                 | ((N & ((1 << 5) - 1)) << 11)\
                                 | ((D & ((1 << 5) - 1)) << 21))
-
+                               
 #define MPU_SUB_SSS(S,N,D) (0x4000078D | ((S & ((1 << 5) - 1)) << 16)\
                                 | ((N & ((1 << 5) - 1)) << 11)\
                                 | ((D & ((1 << 5) - 1)) << 21))
-
+                               
 #define MPU_SUBQ_RIR(S,N,D) (0x14000000 | ((S & ((1 << 5) - 1)) << 16)\
                                  | ((N & ((1 << 16) - 1)) << 0)\
                                  | ((D & ((1 << 5) - 1)) << 21))
-
+                                
 #define MPU_SUBX_RIR_INSTR(S,N,D) (0xC000008D | ((S & ((1 << 5) - 1)) << 16)\
                                        | ((D & ((1 << 5) - 1)) << 21))
-
+                                      
 #define MPU_SUBX_RIR_IMM(S,N,D) (N & 0xFFFFFFFF)
 
 #define MPU_SUBX_SIR_INSTR(S,N,D) (0xC000028D | ((S & ((1 << 5) - 1)) << 16)\
                                        | ((D & ((1 << 5) - 1)) << 21))
-
+                                      
 #define MPU_SUBX_SIR_IMM(S,N,D) (N & 0xFFFFFFFF)
 
 #define MPU_SUBX_RIS_INSTR(S,N,D) (0xC000048D | ((S & ((1 << 5) - 1)) << 16)\
                                        | ((D & ((1 << 5) - 1)) << 21))
-
+                                      
 #define MPU_SUBX_RIS_IMM(S,N,D) (N & 0xFFFFFFFF)
 
 #define MPU_SUBX_SIS_INSTR(S,N,D) (0xC000068D | ((S & ((1 << 5) - 1)) << 16)\
                                        | ((D & ((1 << 5) - 1)) << 21))
-
+                                      
 #define MPU_SUBX_SIS_IMM(S,N,D) (N & 0xFFFFFFFF)
 
 #define MPU_SW_RI(S,D) (0x64000000 | ((S & ((1 << 5) - 1)) << 16)\
                             | ((D & ((1 << 16) - 1)) << 0))
-
+                           
 #define MPU_SW_SI(S,D) (0x64200000 | ((S & ((1 << 5) - 1)) << 16)\
                             | ((D & ((1 << 16) - 1)) << 0))
-
+                           
 #define MPU_SW_RR(S,D) (0x66000000 | ((S & ((1 << 5) - 1)) << 16)\
                             | ((D & ((1 << 5) - 1)) << 11))
-
+                           
 #define MPU_SW_SR(S,D) (0x66200000 | ((S & ((1 << 5) - 1)) << 16)\
                             | ((D & ((1 << 5) - 1)) << 11))
-
+                           
 #define MPU_SW_RS(S,D) (0x67000000 | ((S & ((1 << 5) - 1)) << 16)\
                             | ((D & ((1 << 5) - 1)) << 11))
-
+                           
 #define MPU_SW_SS(S,D) (0x67200000 | ((S & ((1 << 5) - 1)) << 16)\
                             | ((D & ((1 << 5) - 1)) << 11))
-
+                           
 #define MPU_SW_RIR(S,N,D) (0x66000000 | ((S & ((1 << 5) - 1)) << 16)\
                                | ((N & ((1 << 8) - 1)) << 0)\
                                | ((D & ((1 << 5) - 1)) << 11))
-
+                              
 #define MPU_SW_SIR(S,N,D) (0x66200000 | ((S & ((1 << 5) - 1)) << 16)\
                                | ((N & ((1 << 8) - 1)) << 0)\
                                | ((D & ((1 << 5) - 1)) << 11))
-
+                              
 #define MPU_SW_RIS(S,N,D) (0x67000000 | ((S & ((1 << 5) - 1)) << 16)\
                                | ((N & ((1 << 8) - 1)) << 0)\
                                | ((D & ((1 << 5) - 1)) << 11))
-
+                              
 #define MPU_SW_SIS(S,N,D) (0x67200000 | ((S & ((1 << 5) - 1)) << 16)\
                                | ((N & ((1 << 8) - 1)) << 0)\
                                | ((D & ((1 << 5) - 1)) << 11))
-
+                              
 #define MPU_SWX_II_INSTR(S,D) (0xE4000000 | ((D & ((1 << 16) - 1)) << 0))
-
+                                  
 #define MPU_SWX_II_IMM(S,D) (S & 0xFFFFFFFF)
 
 #define MPU_SWX_IR_INSTR(S,D) (0xE6000000 | ((D & ((1 << 5) - 1)) << 11))
-
+                                  
 #define MPU_SWX_IR_IMM(S,D) (S & 0xFFFFFFFF)
 
 #define MPU_SWX_IS_INSTR(S,D) (0xE7000000 | ((D & ((1 << 5) - 1)) << 11))
-
+                                  
 #define MPU_SWX_IS_IMM(S,D) (S & 0xFFFFFFFF)
 
 #define MPU_SWX_IIR_INSTR(S,N,D) (0xE6000000 | ((N & ((1 << 8) - 1)) << 0)\
                                       | ((D & ((1 << 5) - 1)) << 11))
-
+                                     
 #define MPU_SWX_IIR_IMM(S,N,D) (S & 0xFFFFFFFF)
 
 #define MPU_SWX_IIS_INSTR(S,N,D) (0xE7000000 | ((N & ((1 << 8) - 1)) << 0)\
                                       | ((D & ((1 << 5) - 1)) << 11))
-
+                                     
 #define MPU_SWX_IIS_IMM(S,N,D) (S & 0xFFFFFFFF)
 
 #define MPU_XOR_RRR(S,N,D) (0x40000089 | ((S & ((1 << 5) - 1)) << 16)\
                                 | ((N & ((1 << 5) - 1)) << 11)\
                                 | ((D & ((1 << 5) - 1)) << 21))
-
+                               
 #define MPU_XOR_RRS(S,N,D) (0x40000489 | ((S & ((1 << 5) - 1)) << 16)\
                                 | ((N & ((1 << 5) - 1)) << 11)\
                                 | ((D & ((1 << 5) - 1)) << 21))
-
+                               
 #define MPU_XOR_RSR(S,N,D) (0x40000189 | ((S & ((1 << 5) - 1)) << 16)\
                                 | ((N & ((1 << 5) - 1)) << 11)\
                                 | ((D & ((1 << 5) - 1)) << 21))
-
+                               
 #define MPU_XOR_RSS(S,N,D) (0x40000589 | ((S & ((1 << 5) - 1)) << 16)\
                                 | ((N & ((1 << 5) - 1)) << 11)\
                                 | ((D & ((1 << 5) - 1)) << 21))
-
+                               
 #define MPU_XOR_SRR(S,N,D) (0x40000289 | ((S & ((1 << 5) - 1)) << 16)\
                                 | ((N & ((1 << 5) - 1)) << 11)\
                                 | ((D & ((1 << 5) - 1)) << 21))
-
+                               
 #define MPU_XOR_SRS(S,N,D) (0x40000689 | ((S & ((1 << 5) - 1)) << 16)\
                                 | ((N & ((1 << 5) - 1)) << 11)\
                                 | ((D & ((1 << 5) - 1)) << 21))
-
+                               
 #define MPU_XOR_SSR(S,N,D) (0x40000389 | ((S & ((1 << 5) - 1)) << 16)\
                                 | ((N & ((1 << 5) - 1)) << 11)\
                                 | ((D & ((1 << 5) - 1)) << 21))
-
+                               
 #define MPU_XOR_SSS(S,N,D) (0x40000789 | ((S & ((1 << 5) - 1)) << 16)\
                                 | ((N & ((1 << 5) - 1)) << 11)\
                                 | ((D & ((1 << 5) - 1)) << 21))
-
+                               
 #define MPU_XOR_RR(S,D) (0x40000088 | ((S & ((1 << 5) - 1)) << 11)\
                              | ((D & ((1 << 5) - 1)) << 21))
-
+                            
 #define MPU_XOR_RS(S,D) (0x40000488 | ((S & ((1 << 5) - 1)) << 11)\
                              | ((D & ((1 << 5) - 1)) << 21))
-
+                            
 #define MPU_XOR_SR(S,D) (0x40000188 | ((S & ((1 << 5) - 1)) << 11)\
                              | ((D & ((1 << 5) - 1)) << 21))
-
+                            
 #define MPU_XOR_SS(S,D) (0x40000588 | ((S & ((1 << 5) - 1)) << 11)\
                              | ((D & ((1 << 5) - 1)) << 21))
-
+                            
 #define MPU_XORQ_RIR(S,N,D) (0x04000000 | ((S & ((1 << 5) - 1)) << 16)\
                                  | ((N & ((1 << 16) - 1)) << 0)\
                                  | ((D & ((1 << 5) - 1)) << 21))
-
+                                
 #define MPU_XORQ_IRR(S,N,D) (0x04000000 | ((S & ((1 << 16) - 1)) << 0)\
                                  | ((N & ((1 << 5) - 1)) << 16)\
                                  | ((D & ((1 << 5) - 1)) << 21))
-
+                                
 #define MPU_XORX_RIR_INSTR(S,N,D) (0xC0000089 | ((S & ((1 << 5) - 1)) << 16)\
                                        | ((D & ((1 << 5) - 1)) << 21))
-
+                                      
 #define MPU_XORX_RIR_IMM(S,N,D) (N & 0xFFFFFFFF)
 
 #define MPU_XORX_IRR_INSTR(S,N,D) (0xC0000089 | ((N & ((1 << 5) - 1)) << 16)\
                                        | ((D & ((1 << 5) - 1)) << 21))
-
+                                      
 #define MPU_XORX_IRR_IMM(S,N,D) (S & 0xFFFFFFFF)
 
 #define MPU_XORX_SIR_INSTR(S,N,D) (0xC0000289 | ((S & ((1 << 5) - 1)) << 16)\
                                        | ((D & ((1 << 5) - 1)) << 21))
-
+                                      
 #define MPU_XORX_SIR_IMM(S,N,D) (N & 0xFFFFFFFF)
 
 #define MPU_XORX_ISR_INSTR(S,N,D) (0xC0000289 | ((N & ((1 << 5) - 1)) << 16)\
                                        | ((D & ((1 << 5) - 1)) << 21))
-
+                                      
 #define MPU_XORX_ISR_IMM(S,N,D) (S & 0xFFFFFFFF)
 
 #define MPU_XORX_RIS_INSTR(S,N,D) (0xC0000489 | ((S & ((1 << 5) - 1)) << 16)\
                                        | ((D & ((1 << 5) - 1)) << 21))
-
+                                      
 #define MPU_XORX_RIS_IMM(S,N,D) (N & 0xFFFFFFFF)
 
 #define MPU_XORX_IRS_INSTR(S,N,D) (0xC0000489 | ((N & ((1 << 5) - 1)) << 16)\
                                        | ((D & ((1 << 5) - 1)) << 21))
-
+                                      
 #define MPU_XORX_IRS_IMM(S,N,D) (S & 0xFFFFFFFF)
 
 #define MPU_XORX_SIS_INSTR(S,N,D) (0xC0000689 | ((S & ((1 << 5) - 1)) << 16)\
                                        | ((D & ((1 << 5) - 1)) << 21))
-
+                                      
 #define MPU_XORX_SIS_IMM(S,N,D) (N & 0xFFFFFFFF)
 
 #define MPU_XORX_ISS_INSTR(S,N,D) (0xC0000689 | ((N & ((1 << 5) - 1)) << 16)\
                                        | ((D & ((1 << 5) - 1)) << 21))
-
+                                      
 #define MPU_XORX_ISS_IMM(S,N,D) (S & 0xFFFFFFFF)
 
 
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_reg_space.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_reg_space.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_reg_space.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_reg_space.h	2005-04-24 20:31:05.000000000 +0200
@@ -1,5 +1,5 @@
 /* Autogenerated Changes here will be lost!
- * generated by ../gen_sw.pl Mon Apr 11 16:10:18 2005 iop_sw.cfg
+ * generated by ../gen_sw.pl Mon Apr 11 16:10:18 2005 iop_sw.cfg 
  */
 #define regi_iop_version (regi_iop + 0)
 #define regi_iop_fifo_in0_extra (regi_iop + 64)
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_sap_in_defs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_sap_in_defs.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_sap_in_defs.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_sap_in_defs.h	2005-04-24 20:31:05.000000000 +0200
@@ -6,7 +6,7 @@
  *   file:           ../../inst/io_proc/rtl/iop_sap_in.r
  *     id:           <not found>
  *     last modfied: Mon Apr 11 16:08:45 2005
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c --outfile iop_sap_in_defs.h ../../inst/io_proc/rtl/iop_sap_in.r
  *      id: $Id: iop_sap_in_defs.h,v 1.5 2005/04/24 18:31:05 starvik Exp $
  * Any changes here will be lost.
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_sap_out_defs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_sap_out_defs.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_sap_out_defs.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_sap_out_defs.h	2005-04-24 20:31:05.000000000 +0200
@@ -6,7 +6,7 @@
  *   file:           ../../inst/io_proc/rtl/iop_sap_out.r
  *     id:           <not found>
  *     last modfied: Mon Apr 11 16:08:46 2005
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c --outfile iop_sap_out_defs.h ../../inst/io_proc/rtl/iop_sap_out.r
  *      id: $Id: iop_sap_out_defs.h,v 1.5 2005/04/24 18:31:05 starvik Exp $
  * Any changes here will be lost.
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_scrc_in_defs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_scrc_in_defs.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_scrc_in_defs.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_scrc_in_defs.h	2005-04-24 20:31:05.000000000 +0200
@@ -4,9 +4,9 @@
 /*
  * This file is autogenerated from
  *   file:           ../../inst/io_proc/rtl/iop_scrc_in.r
- *     id:           iop_scrc_in.r,v 1.10 2005/02/16 09:13:58 niklaspa Exp
+ *     id:           iop_scrc_in.r,v 1.10 2005/02/16 09:13:58 niklaspa Exp 
  *     last modfied: Mon Apr 11 16:08:46 2005
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c --outfile iop_scrc_in_defs.h ../../inst/io_proc/rtl/iop_scrc_in.r
  *      id: $Id: iop_scrc_in_defs.h,v 1.4 2005/04/24 18:31:05 starvik Exp $
  * Any changes here will be lost.
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_scrc_out_defs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_scrc_out_defs.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_scrc_out_defs.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_scrc_out_defs.h	2005-04-24 20:31:05.000000000 +0200
@@ -4,9 +4,9 @@
 /*
  * This file is autogenerated from
  *   file:           ../../inst/io_proc/rtl/iop_scrc_out.r
- *     id:           iop_scrc_out.r,v 1.11 2005/02/16 09:13:38 niklaspa Exp
+ *     id:           iop_scrc_out.r,v 1.11 2005/02/16 09:13:38 niklaspa Exp 
  *     last modfied: Mon Apr 11 16:08:46 2005
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c --outfile iop_scrc_out_defs.h ../../inst/io_proc/rtl/iop_scrc_out.r
  *      id: $Id: iop_scrc_out_defs.h,v 1.4 2005/04/24 18:31:05 starvik Exp $
  * Any changes here will be lost.
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_spu_defs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_spu_defs.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_spu_defs.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_spu_defs.h	2005-04-24 20:31:05.000000000 +0200
@@ -6,7 +6,7 @@
  *   file:           ../../inst/io_proc/rtl/iop_spu.r
  *     id:           <not found>
  *     last modfied: Mon Apr 11 16:08:46 2005
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c --outfile iop_spu_defs.h ../../inst/io_proc/rtl/iop_spu.r
  *      id: $Id: iop_spu_defs.h,v 1.5 2005/04/24 18:31:05 starvik Exp $
  * Any changes here will be lost.
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_sw_cfg_defs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_sw_cfg_defs.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_sw_cfg_defs.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_sw_cfg_defs.h	2005-04-24 20:31:05.000000000 +0200
@@ -6,7 +6,7 @@
  *   file:           ../../inst/io_proc/rtl/guinness/iop_sw_cfg.r
  *     id:           <not found>
  *     last modfied: Mon Apr 11 16:10:19 2005
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c --outfile iop_sw_cfg_defs.h ../../inst/io_proc/rtl/guinness/iop_sw_cfg.r
  *      id: $Id: iop_sw_cfg_defs.h,v 1.4 2005/04/24 18:31:05 starvik Exp $
  * Any changes here will be lost.
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_sw_cpu_defs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_sw_cpu_defs.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_sw_cpu_defs.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_sw_cpu_defs.h	2005-04-24 20:31:05.000000000 +0200
@@ -6,7 +6,7 @@
  *   file:           ../../inst/io_proc/rtl/guinness/iop_sw_cpu.r
  *     id:           <not found>
  *     last modfied: Mon Apr 11 16:10:19 2005
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c --outfile iop_sw_cpu_defs.h ../../inst/io_proc/rtl/guinness/iop_sw_cpu.r
  *      id: $Id: iop_sw_cpu_defs.h,v 1.4 2005/04/24 18:31:05 starvik Exp $
  * Any changes here will be lost.
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_sw_mpu_defs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_sw_mpu_defs.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_sw_mpu_defs.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_sw_mpu_defs.h	2005-04-24 20:31:05.000000000 +0200
@@ -6,7 +6,7 @@
  *   file:           ../../inst/io_proc/rtl/guinness/iop_sw_mpu.r
  *     id:           <not found>
  *     last modfied: Mon Apr 11 16:10:19 2005
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c --outfile iop_sw_mpu_defs.h ../../inst/io_proc/rtl/guinness/iop_sw_mpu.r
  *      id: $Id: iop_sw_mpu_defs.h,v 1.4 2005/04/24 18:31:05 starvik Exp $
  * Any changes here will be lost.
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_sw_spu_defs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_sw_spu_defs.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_sw_spu_defs.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_sw_spu_defs.h	2005-04-24 20:31:05.000000000 +0200
@@ -6,7 +6,7 @@
  *   file:           ../../inst/io_proc/rtl/guinness/iop_sw_spu.r
  *     id:           <not found>
  *     last modfied: Mon Apr 11 16:10:19 2005
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c --outfile iop_sw_spu_defs.h ../../inst/io_proc/rtl/guinness/iop_sw_spu.r
  *      id: $Id: iop_sw_spu_defs.h,v 1.4 2005/04/24 18:31:05 starvik Exp $
  * Any changes here will be lost.
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_timer_grp_defs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_timer_grp_defs.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_timer_grp_defs.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_timer_grp_defs.h	2005-04-24 20:31:05.000000000 +0200
@@ -4,9 +4,9 @@
 /*
  * This file is autogenerated from
  *   file:           ../../inst/io_proc/rtl/iop_timer_grp.r
- *     id:           iop_timer_grp.r,v 1.29 2005/02/16 09:13:27 niklaspa Exp
+ *     id:           iop_timer_grp.r,v 1.29 2005/02/16 09:13:27 niklaspa Exp 
  *     last modfied: Mon Apr 11 16:08:46 2005
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c --outfile iop_timer_grp_defs.h ../../inst/io_proc/rtl/iop_timer_grp.r
  *      id: $Id: iop_timer_grp_defs.h,v 1.5 2005/04/24 18:31:05 starvik Exp $
  * Any changes here will be lost.
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_trigger_grp_defs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_trigger_grp_defs.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_trigger_grp_defs.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_trigger_grp_defs.h	2005-04-24 20:31:05.000000000 +0200
@@ -4,9 +4,9 @@
 /*
  * This file is autogenerated from
  *   file:           ../../inst/io_proc/rtl/iop_trigger_grp.r
- *     id:           iop_trigger_grp.r,v 0.20 2005/02/16 09:13:20 niklaspa Exp
+ *     id:           iop_trigger_grp.r,v 0.20 2005/02/16 09:13:20 niklaspa Exp 
  *     last modfied: Mon Apr 11 16:08:46 2005
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c --outfile iop_trigger_grp_defs.h ../../inst/io_proc/rtl/iop_trigger_grp.r
  *      id: $Id: iop_trigger_grp_defs.h,v 1.5 2005/04/24 18:31:05 starvik Exp $
  * Any changes here will be lost.
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_version_defs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_version_defs.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/iop/iop_version_defs.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/iop/iop_version_defs.h	2005-04-24 20:31:05.000000000 +0200
@@ -4,9 +4,9 @@
 /*
  * This file is autogenerated from
  *   file:           ../../inst/io_proc/rtl/guinness/iop_version.r
- *     id:           iop_version.r,v 1.3 2004/04/22 12:37:54 jonaso Exp
+ *     id:           iop_version.r,v 1.3 2004/04/22 12:37:54 jonaso Exp 
  *     last modfied: Mon Apr 11 16:08:44 2005
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c --outfile iop_version_defs.h ../../inst/io_proc/rtl/guinness/iop_version.r
  *      id: $Id: iop_version_defs.h,v 1.4 2005/04/24 18:31:05 starvik Exp $
  * Any changes here will be lost.
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/irq_nmi_defs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/irq_nmi_defs.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/irq_nmi_defs.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/irq_nmi_defs.h	2005-04-24 20:30:58.000000000 +0200
@@ -6,7 +6,7 @@
  *   file:           ../../mod/irq_nmi.r
  *     id:           <not found>
  *     last modfied: Thu Jan 22 09:22:43 2004
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c --outfile irq_nmi_defs.h ../../mod/irq_nmi.r
  *      id: $Id: irq_nmi_defs.h,v 1.1 2005/04/24 18:30:58 starvik Exp $
  * Any changes here will be lost.
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/marb_bp_defs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/marb_bp_defs.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/marb_bp_defs.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/marb_bp_defs.h	2004-06-04 09:15:33.000000000 +0200
@@ -6,7 +6,7 @@
  *   file:           ../../inst/memarb/rtl/guinness/marb_top.r
  *     id:           <not found>
  *     last modfied: Fri Nov  7 15:36:04 2003
- *
+ * 
  *   by /n/asic/projects/guinness/design/top/inst/rdesc/rdes2c ../../rtl/global.rmap ../../mod/modreg.rmap -base 0xb0000000 ../../inst/memarb/rtl/guinness/marb_top.r
  *      id: $Id: marb_bp_defs.h,v 1.2 2004/06/04 07:15:33 starvik Exp $
  * Any changes here will be lost.
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/marb_defs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/marb_defs.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/marb_defs.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/marb_defs.h	2005-04-24 20:30:58.000000000 +0200
@@ -6,7 +6,7 @@
  *   file:           ../../inst/memarb/rtl/guinness/marb_top.r
  *     id:           <not found>
  *     last modfied: Mon Apr 11 16:12:16 2005
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c --outfile marb_defs.h ../../inst/memarb/rtl/guinness/marb_top.r
  *      id: $Id: marb_defs.h,v 1.3 2005/04/24 18:30:58 starvik Exp $
  * Any changes here will be lost.
@@ -265,7 +265,7 @@
  *   file:           ../../inst/memarb/rtl/guinness/marb_top.r
  *     id:           <not found>
  *     last modfied: Mon Apr 11 16:12:16 2005
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c --outfile marb_defs.h ../../inst/memarb/rtl/guinness/marb_top.r
  *      id: $Id: marb_defs.h,v 1.3 2005/04/24 18:30:58 starvik Exp $
  * Any changes here will be lost.
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/pinmux_defs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/pinmux_defs.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/pinmux_defs.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/pinmux_defs.h	2005-04-24 20:30:58.000000000 +0200
@@ -4,9 +4,9 @@
 /*
  * This file is autogenerated from
  *   file:           ../../inst/pinmux/rtl/guinness/pinmux_regs.r
- *     id:           pinmux_regs.r,v 1.40 2005/02/09 16:22:59 perz Exp
+ *     id:           pinmux_regs.r,v 1.40 2005/02/09 16:22:59 perz Exp 
  *     last modfied: Mon Apr 11 16:09:11 2005
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c --outfile pinmux_defs.h ../../inst/pinmux/rtl/guinness/pinmux_regs.r
  *      id: $Id: pinmux_defs.h,v 1.3 2005/04/24 18:30:58 starvik Exp $
  * Any changes here will be lost.
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/reg_map.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/reg_map.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/reg_map.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/reg_map.h	2005-04-24 20:30:58.000000000 +0200
@@ -4,17 +4,17 @@
 /*
  * This file is autogenerated from
  *   file:            ../../mod/fakereg.rmap
- *     id:            fakereg.rmap,v 1.3 2004/02/11 19:53:22 ronny Exp
+ *     id:            fakereg.rmap,v 1.3 2004/02/11 19:53:22 ronny Exp 
  *     last modified: Wed Feb 11 20:53:25 2004
  *   file:            ../../rtl/global.rmap
- *     id:            global.rmap,v 1.3 2003/08/18 15:08:23 mikaeln Exp
+ *     id:            global.rmap,v 1.3 2003/08/18 15:08:23 mikaeln Exp 
  *     last modified: Mon Aug 18 17:08:23 2003
  *   file:            ../../mod/modreg.rmap
- *     id:            modreg.rmap,v 1.31 2004/02/20 15:40:04 stefans Exp
+ *     id:            modreg.rmap,v 1.31 2004/02/20 15:40:04 stefans Exp 
  *     last modified: Fri Feb 20 16:40:04 2004
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c -map -base 0xb0000000 ../../rtl/global.rmap ../../mod/modreg.rmap ../../inst/io_proc/rtl/guinness/iop_top.r ../../inst/memarb/rtl/guinness/marb_top.r ../../mod/fakereg.rmap
- *      id: $Id: reg_map.h,v 1.7 2005/04/24 18:30:58 starvik Exp $
+ *      id: $Id: reg_map.h,v 1.7 2005/04/24 18:30:58 starvik Exp $ 
  * Any changes here will be lost.
  *
  * -*- buffer-read-only: t -*-
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/rt_trace_defs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/rt_trace_defs.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/rt_trace_defs.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/rt_trace_defs.h	2005-04-24 20:30:58.000000000 +0200
@@ -4,9 +4,9 @@
 /*
  * This file is autogenerated from
  *   file:           ../../inst/rt_trace/rtl/rt_regs.r
- *     id:           rt_regs.r,v 1.18 2005/02/08 15:45:00 stefans Exp
+ *     id:           rt_regs.r,v 1.18 2005/02/08 15:45:00 stefans Exp 
  *     last modfied: Mon Apr 11 16:09:14 2005
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c --outfile rt_trace_defs.h ../../inst/rt_trace/rtl/rt_regs.r
  *      id: $Id: rt_trace_defs.h,v 1.1 2005/04/24 18:30:58 starvik Exp $
  * Any changes here will be lost.
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/ser_defs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/ser_defs.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/ser_defs.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/ser_defs.h	2005-04-24 20:30:58.000000000 +0200
@@ -4,9 +4,9 @@
 /*
  * This file is autogenerated from
  *   file:           ../../inst/ser/rtl/ser_regs.r
- *     id:           ser_regs.r,v 1.23 2005/02/08 13:58:35 perz Exp
+ *     id:           ser_regs.r,v 1.23 2005/02/08 13:58:35 perz Exp 
  *     last modfied: Mon Apr 11 16:09:21 2005
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c --outfile ser_defs.h ../../inst/ser/rtl/ser_regs.r
  *      id: $Id: ser_defs.h,v 1.10 2005/04/24 18:30:58 starvik Exp $
  * Any changes here will be lost.
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/sser_defs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/sser_defs.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/sser_defs.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/sser_defs.h	2005-04-24 20:30:58.000000000 +0200
@@ -4,9 +4,9 @@
 /*
  * This file is autogenerated from
  *   file:           ../../inst/syncser/rtl/sser_regs.r
- *     id:           sser_regs.r,v 1.24 2005/02/11 14:27:36 gunnard Exp
+ *     id:           sser_regs.r,v 1.24 2005/02/11 14:27:36 gunnard Exp 
  *     last modfied: Mon Apr 11 16:09:48 2005
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c --outfile sser_defs.h ../../inst/syncser/rtl/sser_regs.r
  *      id: $Id: sser_defs.h,v 1.3 2005/04/24 18:30:58 starvik Exp $
  * Any changes here will be lost.
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/strcop.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/strcop.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/strcop.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/strcop.h	2003-10-22 15:27:12.000000000 +0200
@@ -54,4 +54,4 @@
 	hash_iv = 1
 };
 
-
+	
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/strcop_defs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/strcop_defs.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/strcop_defs.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/strcop_defs.h	2005-04-24 20:30:58.000000000 +0200
@@ -4,9 +4,9 @@
 /*
  * This file is autogenerated from
  *   file:           ../../inst/strcop/rtl/strcop_regs.r
- *     id:           strcop_regs.r,v 1.5 2003/10/15 12:09:45 kriskn Exp
+ *     id:           strcop_regs.r,v 1.5 2003/10/15 12:09:45 kriskn Exp 
  *     last modfied: Mon Apr 11 16:09:38 2005
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c --outfile strcop_defs.h ../../inst/strcop/rtl/strcop_regs.r
  *      id: $Id: strcop_defs.h,v 1.7 2005/04/24 18:30:58 starvik Exp $
  * Any changes here will be lost.
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/strmux_defs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/strmux_defs.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/strmux_defs.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/strmux_defs.h	2005-04-24 20:30:58.000000000 +0200
@@ -4,9 +4,9 @@
 /*
  * This file is autogenerated from
  *   file:           ../../inst/strmux/rtl/guinness/strmux_regs.r
- *     id:           strmux_regs.r,v 1.10 2005/02/10 10:10:46 perz Exp
+ *     id:           strmux_regs.r,v 1.10 2005/02/10 10:10:46 perz Exp 
  *     last modfied: Mon Apr 11 16:09:43 2005
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c --outfile strmux_defs.h ../../inst/strmux/rtl/guinness/strmux_regs.r
  *      id: $Id: strmux_defs.h,v 1.5 2005/04/24 18:30:58 starvik Exp $
  * Any changes here will be lost.
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/supp_reg.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/supp_reg.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/supp_reg.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/supp_reg.h	2004-12-17 11:23:03.000000000 +0100
@@ -37,7 +37,7 @@
 #define RW_MM_TLB_HI    6
 #define RW_MM_TLB_PGD   7
 
-#define BANK_GC		0
+#define BANK_GC		0 
 #define BANK_IM		1
 #define BANK_DM		2
 #define BANK_BP		3
@@ -63,7 +63,7 @@
 	SPEC_REG_WR(SPEC_REG_SRS,b);	\
 	NOP();				\
 	NOP();				\
-	NOP();
+	NOP();				
 
 #define SUPP_REG_WR(r,v) \
 __asm__ __volatile__ ("move %0, $S" STRINGIFYFY(r) "\n\t"	\
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/timer_defs.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/timer_defs.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/hwregs/timer_defs.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/hwregs/timer_defs.h	2005-04-24 20:30:58.000000000 +0200
@@ -4,9 +4,9 @@
 /*
  * This file is autogenerated from
  *   file:           ../../inst/timer/rtl/timer_regs.r
- *     id:           timer_regs.r,v 1.7 2003/03/11 11:16:59 perz Exp
+ *     id:           timer_regs.r,v 1.7 2003/03/11 11:16:59 perz Exp 
  *     last modfied: Mon Apr 11 16:09:53 2005
- *
+ * 
  *   by /n/asic/design/tools/rdesc/src/rdes2c --outfile timer_defs.h ../../inst/timer/rtl/timer_regs.r
  *      id: $Id: timer_defs.h,v 1.6 2005/04/24 18:30:58 starvik Exp $
  * Any changes here will be lost.
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/ide.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/ide.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/ide.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/ide.h	2005-08-23 11:44:37.000000000 +0200
@@ -33,7 +33,7 @@
 	 * together in a hwgroup, and will serialize accesses. this is good, because
 	 * we can't access more than one interface at the same time on ETRAX100.
 	 */
-	return ATA_INTR_VECT;
+	return ATA_INTR_VECT; 
 }
 
 static inline unsigned long ide_default_io_base(int index)
@@ -44,7 +44,7 @@
 	 * so we can use the io_base to remember that bitfield.
 	 */
         ctrl2.sel = index;
-
+        
 	return REG_TYPE_CONV(unsigned long, reg_ata_rw_ctrl2, ctrl2);
 }
 
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/io.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/io.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/io.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/io.h	2006-12-06 14:17:02.000000000 +0100
@@ -1,6 +1,7 @@
 #ifndef _ASM_ARCH_CRIS_IO_H
 #define _ASM_ARCH_CRIS_IO_H
 
+#include <linux/spinlock.h>
 #include <asm/arch/hwregs/reg_map.h>
 #include <asm/arch/hwregs/reg_rdwr.h>
 #include <asm/arch/hwregs/gio_defs.h>
@@ -13,10 +14,11 @@
 
 struct crisv32_ioport
 {
-  unsigned long* oe;
-  unsigned long* data;
-  unsigned long* data_in;
+  volatile unsigned long* oe;
+  volatile unsigned long* data;
+  volatile unsigned long* data_in;
   unsigned int pin_count;
+  spinlock_t lock;
 };
 
 struct crisv32_iopin
@@ -34,22 +36,37 @@
 extern struct crisv32_iopin crisv32_led3_green;
 extern struct crisv32_iopin crisv32_led3_red;
 
+extern struct crisv32_iopin crisv32_led_net0_green;
+extern struct crisv32_iopin crisv32_led_net0_red;
+extern struct crisv32_iopin crisv32_led_net1_green;
+extern struct crisv32_iopin crisv32_led_net1_red;
+
 static inline void crisv32_io_set(struct crisv32_iopin* iopin,
 			   int val)
 {
+	long flags;
+	spin_lock_irqsave(&iopin->port->lock, flags);
+
 	if (val)
 		*iopin->port->data |= iopin->bit;
 	else
 		*iopin->port->data &= ~iopin->bit;
+
+	spin_unlock_irqrestore(&iopin->port->lock, flags);
 }
 
 static inline void crisv32_io_set_dir(struct crisv32_iopin* iopin,
 			       enum crisv32_io_dir dir)
 {
+	long flags;
+	spin_lock_irqsave(&iopin->port->lock, flags);
+
 	if (dir == crisv32_io_dir_in)
 		*iopin->port->oe &= ~iopin->bit;
 	else
 		*iopin->port->oe |= iopin->bit;
+
+	spin_unlock_irqrestore(&iopin->port->lock, flags);
 }
 
 static inline int crisv32_io_rd(struct crisv32_iopin* iopin)
@@ -60,28 +77,51 @@
 int crisv32_io_get(struct crisv32_iopin* iopin,
                    unsigned int port, unsigned int pin);
 int crisv32_io_get_name(struct crisv32_iopin* iopin,
-                         char* name);
+			const char* name);
 
 #define LED_OFF    0x00
 #define LED_GREEN  0x01
 #define LED_RED    0x02
 #define LED_ORANGE (LED_GREEN | LED_RED)
 
-#define LED_NETWORK_SET(x)                          \
-	do {                                        \
-		LED_NETWORK_SET_G((x) & LED_GREEN); \
-		LED_NETWORK_SET_R((x) & LED_RED);   \
+#if (defined(CONFIG_ETRAX_NBR_LED_GRP_ONE) || defined(CONFIG_ETRAX_NBR_LED_GRP_TWO))
+#define LED_NETWORK_GRP0_SET(x)                          \
+	do {                                             \
+		LED_NETWORK_GRP0_SET_G((x) & LED_GREEN); \
+		LED_NETWORK_GRP0_SET_R((x) & LED_RED);   \
 	} while (0)
+#else
+#define LED_NETWORK_GRP0_SET(x) while (0) {}
+#endif
+
+#define LED_NETWORK_GRP0_SET_G(x) \
+	crisv32_io_set(&crisv32_led_net0_green, !(x));
+
+#define LED_NETWORK_GRP0_SET_R(x) \
+	crisv32_io_set(&crisv32_led_net0_red, !(x));
+
+#if defined(CONFIG_ETRAX_NBR_LED_GRP_TWO)
+#define LED_NETWORK_GRP1_SET(x)                          \
+	do {                                             \
+		LED_NETWORK_GRP1_SET_G((x) & LED_GREEN); \
+		LED_NETWORK_GRP1_SET_R((x) & LED_RED);   \
+	} while (0)
+#else
+#define LED_NETWORK_GRP1_SET(x) while (0) {}
+#endif
+
+#define LED_NETWORK_GRP1_SET_G(x) \
+	crisv32_io_set(&crisv32_led_net1_green, !(x));
+
+#define LED_NETWORK_GRP1_SET_R(x) \
+	crisv32_io_set(&crisv32_led_net1_red, !(x));
+
 #define LED_ACTIVE_SET(x)                           \
 	do {                                        \
 		LED_ACTIVE_SET_G((x) & LED_GREEN);  \
 		LED_ACTIVE_SET_R((x) & LED_RED);    \
 	} while (0)
 
-#define LED_NETWORK_SET_G(x) \
-	crisv32_io_set(&crisv32_led1_green, !(x));
-#define LED_NETWORK_SET_R(x) \
-	crisv32_io_set(&crisv32_led1_red, !(x));
 #define LED_ACTIVE_SET_G(x) \
 	crisv32_io_set(&crisv32_led2_green, !(x));
 #define LED_ACTIVE_SET_R(x) \
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/irq.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/irq.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/irq.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/irq.h	2006-10-13 14:45:18.000000000 +0200
@@ -50,7 +50,7 @@
 #define IRQ_NAME2(nr) nr##_interrupt(void)
 #define IRQ_NAME(nr) IRQ_NAME2(IRQ##nr)
 
-/*
+/* 
  * The reason for setting the S-bit when debugging the kernel is that we want
  * hardware breakpoints to remain active while we are in an exception handler.
  * Note that we cannot simply copy S1, since we may come here from user-space,
@@ -86,7 +86,7 @@
 	"moveq 1, $r11\n\t"		\
 	"jump ret_from_intr\n\t"	\
 	"nop\n\t");
-/*
+/* 
  * This is subtle. The timer interrupt is crucial and it should not be disabled
  * for too long. However, if it had been a normal interrupt as per BUILD_IRQ, it
  * would have been BLOCK'ed, and then softirq's are run before we return here to
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/juliette.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/juliette.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/juliette.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/juliette.h	2004-06-09 11:20:19.000000000 +0200
@@ -166,7 +166,7 @@
 #define PA_NULL           0x3fff /* CCD/VIDEO */
 
 typedef enum {
-	jpeg  = 0,
+	jpeg  = 0, 
 	dummy = 1
 } request_type;
 
@@ -176,8 +176,8 @@
 	halfsize  = 2,
 	fieldsize = 3
 } size_type;
-
-typedef enum {
+  
+typedef enum { 
 	min       = 0,
 	low       = 1,
 	medium    = 2,
@@ -192,14 +192,14 @@
 	q6        = 11
 } compr_type;
 
-typedef enum {
+typedef enum { 
 	deg_0   = 0,
 	deg_180 = 1,
 	deg_90  = 2,
 	deg_270 = 3
 } rotation_type;
 
-typedef enum {
+typedef enum { 
 	auto_white    = 0,
 	hold          = 1,
 	fixed_outdoor = 2,
@@ -207,12 +207,12 @@
 	fixed_fluor   = 4
 } white_balance_type;
 
-typedef enum {
+typedef enum { 
 	auto_exp  = 0,
 	fixed_exp = 1
 } exposure_type;
 
-typedef enum {
+typedef enum { 
 	no_window = 0,
 	center    = 1,
 	top       = 2,
@@ -242,7 +242,7 @@
 	right_align = 2
 } alignment_type;
 
-typedef enum {
+typedef enum { 
 	off = 0,
 	on  = 1,
 	no  = 0,
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/mmu.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/mmu.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/mmu.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/mmu.h	2004-11-23 19:36:19.000000000 +0100
@@ -34,7 +34,7 @@
  *       +-----+------+--------+-------+--------+-------+---------+
  */
 
-/*
+/* 
  * Defines for accessing the bits. Also define some synonyms for use with
  * the software-based defined bits below.
  */
@@ -46,7 +46,7 @@
 #define _PAGE_SILENT_READ   (1 << 3)	/* Same as above. */
 #define _PAGE_GLOBAL        (1 << 4)	/* Global page. */
 
-/*
+/* 
  * The hardware doesn't care about these bits, but the kernel uses them in
  * software.
  */
@@ -84,9 +84,9 @@
 
 #define _KERNPG_TABLE   (_PAGE_TABLE | _PAGE_KERNEL)
 
-/* CRISv32 can do page protection for execute.
+/* CRISv32 can do page protection for execute.  
  * Write permissions imply read permissions.
- * Note that the numbers are in Execute-Write-Read order!
+ * Note that the numbers are in Execute-Write-Read order! 
  */
 #define __P000  PAGE_NONE
 #define __P001  PAGE_READONLY
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/offset.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/offset.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/offset.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/offset.h	2005-08-29 09:36:28.000000000 +0200
@@ -27,7 +27,7 @@
 #define THREAD_usp 4 /* offsetof(struct thread_struct, usp) */
 #define THREAD_ccs 8 /* offsetof(struct thread_struct, ccs) */
 
-#define TASK_pid 149 /* offsetof(struct task_struct, pid) */
+#define TASK_pid 151 /* offsetof(struct task_struct, pid) */
 
 #define LCLONE_VM 256 /* CLONE_VM */
 #define LCLONE_UNTRACED 8388608 /* CLONE_UNTRACED */
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/page.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/page.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/page.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/page.h	2006-10-13 14:45:18.000000000 +0200
@@ -11,7 +11,7 @@
  * selected bit it's possible to convert between KSEG_x and 0x40000000 where the
  * DRAM really resides. DRAM is virtually at 0xc.
  */
-#ifndef CONFIG_ETRAXFS_SIM
+#ifndef CONFIG_ETRAXFS_SIM	
 #define __pa(x) ((unsigned long)(x) & 0x7fffffff)
 #define __va(x) ((void *)((unsigned long)(x) | 0x80000000))
 #else
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/pinmux.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/pinmux.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/pinmux.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/pinmux.h	2005-07-02 14:30:13.000000000 +0200
@@ -1,7 +1,7 @@
 #ifndef _ASM_CRIS_ARCH_PINMUX_H
 #define _ASM_CRIS_ARCH_PINMUX_H
 
-#define PORT_B 0
+#define PORT_B 0 
 #define PORT_C 1
 #define PORT_D 2
 #define PORT_E 3
@@ -34,6 +34,7 @@
 int crisv32_pinmux_alloc(int port, int first_pin, int last_pin, enum pin_mode);
 int crisv32_pinmux_alloc_fixed(enum fixed_function function);
 int crisv32_pinmux_dealloc(int port, int first_pin, int last_pin);
+int crisv32_pinmux_dealloc_fixed(enum fixed_function function);
 void crisv32_pinmux_dump(void);
 
 #endif
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/processor.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/processor.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/processor.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/processor.h	2006-10-13 14:45:18.000000000 +0200
@@ -19,7 +19,7 @@
 	unsigned long ccs;	/* Saved flags register. */
 };
 
-/*
+/* 
  * User-space process size. This is hardcoded into a few places, so don't
  * changed it unless everything's clear!
  */
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/ptrace.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/ptrace.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/ptrace.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/ptrace.h	2004-10-21 13:51:21.000000000 +0200
@@ -49,7 +49,7 @@
 #define CCS_SHIFT   10 /* Shift count for each level in CCS */
 
 /* pt_regs not only specifices the format in the user-struct during
- * ptrace but is also the frame format used in the kernel prologue/epilogues
+ * ptrace but is also the frame format used in the kernel prologue/epilogues 
  * themselves
  */
 
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/spinlock.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/spinlock.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/spinlock.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/spinlock.h	2007-01-09 10:31:32.000000000 +0100
@@ -19,7 +19,7 @@
 	__asm__ volatile ("move.d %1,%0" \
 	                  : "=m" (lock->lock) \
 			  : "r" (1) \
-			  : "memory");
+			  : "memory"); 
 }
 
 static inline int _raw_spin_trylock(spinlock_t *lock)
@@ -80,7 +80,7 @@
 {
 	unsigned long flags;
 	local_irq_save(flags);
-	_raw_spin_lock(&rw->lock);
+	_raw_spin_lock(&rw->lock); 
 
 	rw->counter++;
 
@@ -92,7 +92,7 @@
 {
 	unsigned long flags;
 	local_irq_save(flags);
-	_raw_spin_lock(&rw->lock);
+	_raw_spin_lock(&rw->lock); 
 
 	rw->counter--;
 
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/system.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/system.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/system.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/system.h	2006-10-13 14:45:18.000000000 +0200
@@ -39,7 +39,7 @@
 #define xchg(ptr,x) \
 	((__typeof__(*(ptr)))__xchg((unsigned long) (x),(ptr),sizeof(*(ptr))))
 
-#define tas(ptr) (xchg((ptr),1))
+#define tas(ptr) (xchg((ptr),1))	
 
 struct __xchg_dummy { unsigned long a[100]; };
 #define __xg(x) ((struct __xchg_dummy *)(x))
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/timex.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/timex.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/timex.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/timex.h	2005-08-23 11:44:37.000000000 +0200
@@ -6,8 +6,8 @@
 #include <asm/arch/hwregs/timer_defs.h>
 
 /*
- * The clock runs at 100MHz, we divide it by 1000000. If you change anything
- * here you must check time.c as well.
+ * The clock runs at 100MHz, we divide it by 1000000. If you change anything 
+ * here you must check time.c as well. 
  */
 
 #define CLOCK_TICK_RATE 100000000	/* Underlying frequency of the HZ timer */
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/tlb.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/tlb.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/tlb.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/tlb.h	2003-07-02 11:29:45.000000000 +0200
@@ -2,8 +2,8 @@
 #define _CRIS_ARCH_TLB_H
 
 /*
- * The TLB is a 64-entry cache. Each entry has a 8-bit page_id that is used
- * to store the "process" it belongs to (=> fast mm context switch). The
+ * The TLB is a 64-entry cache. Each entry has a 8-bit page_id that is used 
+ * to store the "process" it belongs to (=> fast mm context switch). The 
  * last page_id is never used so we can make TLB entries that never matches.
  */
 #define NUM_TLB_ENTRIES 64
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/uaccess.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/uaccess.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/uaccess.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/uaccess.h	2006-01-04 07:13:04.000000000 +0100
@@ -1,4 +1,4 @@
-/*
+/* 
  * Authors:    Hans-Peter Nilsson (hp@axis.com)
  *
  */
diff -urN linux-2.6.19.2.old/include/asm-cris/arch-v32/unistd.h linux-2.6.19.2.dev/include/asm-cris/arch-v32/unistd.h
--- linux-2.6.19.2.old/include/asm-cris/arch-v32/unistd.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/arch-v32/unistd.h	2005-10-31 09:50:44.000000000 +0100
@@ -16,7 +16,8 @@
 			".endif\n\t" \
 			"break 13" \
 			: "=r" (__a) \
-			: "r" (__n_)); \
+			: "r" (__n_) \
+                        : "memory"); \
   if (__a >= 0) \
      return (type) __a; \
   errno = -__a; \
@@ -33,7 +34,8 @@
 			".endif\n\t" \
 			"break 13" \
 			: "=r" (__a) \
-			: "r" (__n_), "0" (__a)); \
+			: "r" (__n_), "0" (__a) \
+                        : "memory"); \
   if (__a >= 0) \
      return (type) __a; \
   errno = -__a; \
@@ -51,7 +53,8 @@
 			".endif\n\t" \
 			"break 13" \
 			: "=r" (__a) \
-			: "r" (__n_), "0" (__a), "r" (__b)); \
+			: "r" (__n_), "0" (__a), "r" (__b) \
+                        : "memory"); \
   if (__a >= 0) \
      return (type) __a; \
   errno = -__a; \
@@ -70,7 +73,8 @@
 			".endif\n\t" \
 			"break 13" \
 			: "=r" (__a) \
-			: "r" (__n_), "0" (__a), "r" (__b), "r" (__c)); \
+			: "r" (__n_), "0" (__a), "r" (__b), "r" (__c) \
+                        : "memory"); \
   if (__a >= 0) \
      return (type) __a; \
   errno = -__a; \
@@ -91,12 +95,13 @@
 			"break 13" \
 			: "=r" (__a) \
 			: "r" (__n_), "0" (__a), "r" (__b), \
-			  "r" (__c), "r" (__d)); \
+			  "r" (__c), "r" (__d)\
+                        : "memory"); \
   if (__a >= 0) \
      return (type) __a; \
   errno = -__a; \
   return (type) -1; \
-}
+} 
 
 #define _syscall5(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4, \
 	  type5,arg5) \
@@ -114,7 +119,8 @@
 			"break 13" \
 			: "=r" (__a) \
 			: "r" (__n_), "0" (__a), "r" (__b), \
-			  "r" (__c), "r" (__d), "h" (__e)); \
+			  "r" (__c), "r" (__d), "h" (__e) \
+                        : "memory"); \
   if (__a >= 0) \
      return (type) __a; \
   errno = -__a; \
@@ -138,7 +144,8 @@
 			"break 13" \
 			: "=r" (__a) \
 			: "r" (__n_), "0" (__a), "r" (__b), \
-			  "r" (__c), "r" (__d), "h" (__e), "x" (__f)); \
+			  "r" (__c), "r" (__d), "h" (__e), "x" (__f) \
+                        : "memory"); \
   if (__a >= 0) \
      return (type) __a; \
   errno = -__a; \
diff -urN linux-2.6.19.2.old/include/asm-cris/atomic.h linux-2.6.19.2.dev/include/asm-cris/atomic.h
--- linux-2.6.19.2.old/include/asm-cris/atomic.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/atomic.h	2006-07-03 15:11:43.000000000 +0200
@@ -5,6 +5,7 @@
 
 #include <asm/system.h>
 #include <asm/arch/atomic.h>
+#include <linux/compiler.h>
 
 /*
  * Atomic operations that C can't guarantee us.  Useful for
@@ -89,7 +90,7 @@
 	unsigned long flags;
 	int retval;
 	cris_atomic_save(v, flags);
-	retval = (v->counter)++;
+	retval = ++(v->counter);
 	cris_atomic_restore(v, flags);
 	return retval;
 }
@@ -99,7 +100,7 @@
 	unsigned long flags;
 	int retval;
 	cris_atomic_save(v, flags);
-	retval = (v->counter)--;
+	retval = --(v->counter);
 	cris_atomic_restore(v, flags);
 	return retval;
 }
diff -urN linux-2.6.19.2.old/include/asm-cris/axisflashmap.h linux-2.6.19.2.dev/include/asm-cris/axisflashmap.h
--- linux-2.6.19.2.old/include/asm-cris/axisflashmap.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/axisflashmap.h	2006-09-07 14:24:25.000000000 +0200
@@ -15,18 +15,18 @@
 /* The partitiontable_head is located at offset +10: */
 struct partitiontable_head {
 	__u16 magic; /* PARTITION_TABLE_MAGIC */ 
-	__u16 size;  /* Length of ptable block (not header) */
-	__u32 checksum; /* simple longword sum */
+	__u16 size;  /* Length of ptable block (entries + end marker) */
+	__u32 checksum; /* simple longword sum, over entries + end marker  */
 };
 
 /* And followed by partition table entries */
 struct partitiontable_entry {
-	__u32 offset;   /* Offset is relative to the sector the ptable is in */
-	__u32 size;
+	__u32 offset;   /* relative to the sector the ptable is in */
+	__u32 size;	/* in bytes */
 	__u32 checksum; /* simple longword sum */
-	__u16 type;
-	__u16 flags;   /* bit 0: ro/rw = 1/0 */
-	__u32 future0; /* 16 bytes reserved for future use */
+	__u16 type;	/* see type codes below */
+	__u16 flags;	/* bit 0: ro/rw = 1/0 */
+	__u32 future0;	/* 16 bytes reserved for future use */
 	__u32 future1;
 	__u32 future2;
 	__u32 future3;
@@ -35,10 +35,25 @@
 #define PARTITIONTABLE_END_MARKER 0xFFFFFFFF
 #define PARTITIONTABLE_END_MARKER_SIZE 4
 
-/*#define PARTITION_TYPE_RESCUE 0x0000?*/  /* Not used, maybe it should? */
+#define PARTITIONTABLE_END_PAD	10
+
+/* Complete structure for whole partition table */
+/* note that table may end before CONFIG_ETRAX_PTABLE_ENTRIES by setting
+ * offset of the last entry + 1 to PARTITIONTABLE_END_MARKER.
+ */
+struct partitiontable {
+	__u8 skip[PARTITION_TABLE_OFFSET];
+	struct partitiontable_head head;
+	struct partitiontable_entry entries[];
+};
+
 #define PARTITION_TYPE_PARAM  0x0001
 #define PARTITION_TYPE_KERNEL 0x0002
 #define PARTITION_TYPE_JFFS   0x0003
+#define PARTITION_TYPE_JFFS2  0x0000
+
+#define	PARTITION_FLAGS_READONLY_MASK	0x0001
+#define	PARTITION_FLAGS_READONLY	0x0001
 
 /* The master mtd for the entire flash. */
 extern struct mtd_info* axisflash_mtd;
diff -urN linux-2.6.19.2.old/include/asm-cris/bitops.h linux-2.6.19.2.dev/include/asm-cris/bitops.h
--- linux-2.6.19.2.old/include/asm-cris/bitops.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/bitops.h	2007-01-09 10:31:32.000000000 +0100
@@ -155,7 +155,7 @@
 #include <asm-generic/bitops/hweight.h>
 #include <asm-generic/bitops/find.h>
 
-#include <asm-generic/bitops/ext2-non-atomic.h>
+//#include <asm-generic/bitops/ext2-non-atomic.h>
 
 #define ext2_set_bit_atomic(l,n,a)   test_and_set_bit(n,a)
 #define ext2_clear_bit_atomic(l,n,a) test_and_clear_bit(n,a)
diff -urN linux-2.6.19.2.old/include/asm-cris/bug.h linux-2.6.19.2.dev/include/asm-cris/bug.h
--- linux-2.6.19.2.old/include/asm-cris/bug.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/bug.h	2006-06-21 10:29:15.000000000 +0200
@@ -1,4 +1,4 @@
 #ifndef _CRIS_BUG_H
 #define _CRIS_BUG_H
-#include <asm-generic/bug.h>
+#include <asm/arch/bug.h>
 #endif
diff -urN linux-2.6.19.2.old/include/asm-cris/delay.h linux-2.6.19.2.dev/include/asm-cris/delay.h
--- linux-2.6.19.2.old/include/asm-cris/delay.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/delay.h	2006-10-11 19:46:19.000000000 +0200
@@ -13,10 +13,13 @@
 
 extern unsigned long loops_per_usec; /* arch/cris/mm/init.c */
 
+/* May be defined by arch/delay.h. */
+#ifndef udelay
 static inline void udelay(unsigned long usecs)
 {
 	__delay(usecs * loops_per_usec);
 }
+#endif
 
 #endif /* defined(_CRIS_DELAY_H) */
 
diff -urN linux-2.6.19.2.old/include/asm-cris/ethernet.h linux-2.6.19.2.dev/include/asm-cris/ethernet.h
--- linux-2.6.19.2.old/include/asm-cris/ethernet.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/ethernet.h	2006-07-06 07:58:52.000000000 +0200
@@ -15,4 +15,7 @@
 #define SET_ETH_DUPLEX_AUTO     SIOCDEVPRIVATE+3        /* Auto neg duplex */
 #define SET_ETH_DUPLEX_HALF     SIOCDEVPRIVATE+4        /* Full duplex */
 #define SET_ETH_DUPLEX_FULL     SIOCDEVPRIVATE+5        /* Half duplex */
+#define SET_ETH_ENABLE_LEDS     SIOCDEVPRIVATE+6        /* Enable net LEDs */
+#define SET_ETH_DISABLE_LEDS    SIOCDEVPRIVATE+7        /* Disable net LEDs */
+#define SET_ETH_AUTONEG         SIOCDEVPRIVATE+8
 #endif /* _CRIS_ETHERNET_H */
diff -urN linux-2.6.19.2.old/include/asm-cris/etraxgpio.h linux-2.6.19.2.dev/include/asm-cris/etraxgpio.h
--- linux-2.6.19.2.old/include/asm-cris/etraxgpio.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/etraxgpio.h	2007-01-09 10:31:32.000000000 +0100
@@ -16,15 +16,19 @@
  * For ETRAX FS (ARCH_V32):
  * /dev/gpioa  minor 0,  8 bit GPIO, each bit can change direction
  * /dev/gpiob  minor 1, 18 bit GPIO, each bit can change direction
- * /dev/gpioc  minor 2, 18 bit GPIO, each bit can change direction
- * /dev/gpiod  minor 3, 18 bit GPIO, each bit can change direction
- * /dev/gpioe  minor 4, 18 bit GPIO, each bit can change direction
- * /dev/leds   minor 5, Access to leds depending on kernelconfig
+ * /dev/gpioc  minor 3, 18 bit GPIO, each bit can change direction
+ * /dev/gpiod  minor 4, 18 bit GPIO, each bit can change direction
+ * /dev/gpioe  minor 5, 18 bit GPIO, each bit can change direction
+ * /dev/leds   minor 2, Access to leds depending on kernelconfig
  *
  */
 #ifndef _ASM_ETRAXGPIO_H
 #define _ASM_ETRAXGPIO_H
 
+#ifndef __KERNEL__
+#include <linux/autoconf.h>
+#endif
+
 /* etraxgpio _IOC_TYPE, bits 8 to 15 in ioctl cmd */
 #ifdef CONFIG_ETRAX_ARCH_V10
 #define ETRAXGPIO_IOCTYPE 43
@@ -42,8 +46,13 @@
 #define GPIO_MINOR_C 3
 #define GPIO_MINOR_D 4
 #define GPIO_MINOR_E 5
+#ifdef CONFIG_ETRAX_VIRTUAL_GPIO
+#define GPIO_MINOR_V 6
+#define GPIO_MINOR_LAST 6
+#else
 #define GPIO_MINOR_LAST 5
 #endif
+#endif
 
 /* supported ioctl _IOC_NR's */
 
diff -urN linux-2.6.19.2.old/include/asm-cris/fasttimer.h linux-2.6.19.2.dev/include/asm-cris/fasttimer.h
--- linux-2.6.19.2.old/include/asm-cris/fasttimer.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/fasttimer.h	2006-12-11 12:22:38.000000000 +0100
@@ -1,9 +1,9 @@
-/* $Id: fasttimer.h,v 1.3 2004/05/14 10:19:19 starvik Exp $
+/*
  * linux/include/asm-cris/fasttimer.h
  *
  * Fast timers for ETRAX100LX
  * This may be useful in other OS than Linux so use 2 space indentation...
- * Copyright (C) 2000, 2002 Axis Communications AB
+ * Copyright (C) 2000-2006 Axis Communications AB
  */
 #include <linux/time.h> /* struct timeval */
 #include <linux/timex.h>
@@ -12,11 +12,16 @@
 
 typedef void fast_timer_function_type(unsigned long);
 
+struct fasttime_t {
+  unsigned long tv_jiff;  /* jiffies */
+  unsigned long tv_usec;  /* microseconds */
+};
+
 struct fast_timer{ /* Close to timer_list */
   struct fast_timer *next;
   struct fast_timer *prev;
-  struct timeval tv_set;
-  struct timeval tv_expires;
+  struct fasttime_t tv_set;
+  struct fasttime_t tv_expires;
   unsigned long delay_us;
   fast_timer_function_type *function;
   unsigned long data;
@@ -38,6 +43,6 @@
 void schedule_usleep(unsigned long us);
 
 
-void fast_timer_init(void);
+int fast_timer_init(void);
 
 #endif
diff -urN linux-2.6.19.2.old/include/asm-cris/hardirq.h linux-2.6.19.2.dev/include/asm-cris/hardirq.h
--- linux-2.6.19.2.old/include/asm-cris/hardirq.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/hardirq.h	2005-10-31 09:50:43.000000000 +0100
@@ -1,6 +1,7 @@
 #ifndef __ASM_HARDIRQ_H
 #define __ASM_HARDIRQ_H
 
+#include <asm/irq.h>
 #include <linux/threads.h>
 #include <linux/cache.h>
 
diff -urN linux-2.6.19.2.old/include/asm-cris/io.h linux-2.6.19.2.dev/include/asm-cris/io.h
--- linux-2.6.19.2.old/include/asm-cris/io.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/io.h	2006-01-04 07:13:03.000000000 +0100
@@ -127,8 +127,8 @@
 
 #define eth_io_copy_and_sum(a,b,c,d)	eth_copy_and_sum((a),(void __force *)(b),(c),(d))
 
-/* The following is junk needed for the arch-independent code but which
- * we never use in the CRIS port
+/* I/O port access. Normally there is no I/O space on CRIS but when Cardbus/PCI 
+ * is enable the request is passed through the bridge.
  */
 
 #define IO_SPACE_LIMIT 0xffff
diff -urN linux-2.6.19.2.old/include/asm-cris/irq_regs.h linux-2.6.19.2.dev/include/asm-cris/irq_regs.h
--- linux-2.6.19.2.old/include/asm-cris/irq_regs.h	1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/irq_regs.h	2007-01-09 10:31:32.000000000 +0100
@@ -0,0 +1 @@
+#include <asm-generic/irq_regs.h>
diff -urN linux-2.6.19.2.old/include/asm-cris/pgtable.h linux-2.6.19.2.dev/include/asm-cris/pgtable.h
--- linux-2.6.19.2.old/include/asm-cris/pgtable.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/pgtable.h	2007-01-12 15:41:37.000000000 +0100
@@ -279,7 +279,7 @@
 #define pte_unmap(pte) do { } while (0)
 #define pte_unmap_nested(pte) do { } while (0)
 #define pte_pfn(x)		((unsigned long)(__va((x).pte)) >> PAGE_SHIFT)
-#define pfn_pte(pfn, prot)	__pte((__pa((pfn) << PAGE_SHIFT)) | pgprot_val(prot))
+#define pfn_pte(pfn, prot)	__pte(((pfn) << PAGE_SHIFT) | pgprot_val(prot))
 
 #define pte_ERROR(e) \
         printk("%s:%d: bad pte %p(%08lx).\n", __FILE__, __LINE__, &(e), pte_val(e))
diff -urN linux-2.6.19.2.old/include/asm-cris/semaphore-helper.h linux-2.6.19.2.dev/include/asm-cris/semaphore-helper.h
--- linux-2.6.19.2.old/include/asm-cris/semaphore-helper.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/semaphore-helper.h	2005-08-23 11:44:35.000000000 +0200
@@ -20,12 +20,12 @@
 /*
  * These two _must_ execute atomically wrt each other.
  */
-extern inline void wake_one_more(struct semaphore * sem)
+static inline void wake_one_more(struct semaphore * sem)
 {
 	atomic_inc(&sem->waking);
 }
 
-extern inline int waking_non_zero(struct semaphore *sem)
+static inline int waking_non_zero(struct semaphore *sem)
 {
 	unsigned long flags;
 	int ret = 0;
@@ -40,7 +40,7 @@
 	return ret;
 }
 
-extern inline int waking_non_zero_interruptible(struct semaphore *sem,
+static inline int waking_non_zero_interruptible(struct semaphore *sem,
 						struct task_struct *tsk)
 {
 	int ret = 0;
@@ -59,7 +59,7 @@
 	return ret;
 }
 
-extern inline int waking_non_zero_trylock(struct semaphore *sem)
+static inline int waking_non_zero_trylock(struct semaphore *sem)
 {
         int ret = 1;
 	unsigned long flags;
diff -urN linux-2.6.19.2.old/include/asm-cris/semaphore.h linux-2.6.19.2.dev/include/asm-cris/semaphore.h
--- linux-2.6.19.2.old/include/asm-cris/semaphore.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/semaphore.h	2006-01-04 07:13:03.000000000 +0100
@@ -51,7 +51,6 @@
 {
         sema_init(sem, 0);
 }
-
 extern void __down(struct semaphore * sem);
 extern int __down_interruptible(struct semaphore * sem);
 extern int __down_trylock(struct semaphore * sem);
diff -urN linux-2.6.19.2.old/include/asm-cris/smp.h linux-2.6.19.2.dev/include/asm-cris/smp.h
--- linux-2.6.19.2.old/include/asm-cris/smp.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/smp.h	2005-10-31 09:50:43.000000000 +0100
@@ -4,7 +4,7 @@
 #include <linux/cpumask.h>
 
 extern cpumask_t phys_cpu_present_map;
-#define cpu_possible_map phys_cpu_present_map
+extern cpumask_t cpu_possible_map;
 
 #define __smp_processor_id() (current_thread_info()->cpu)
 
diff -urN linux-2.6.19.2.old/include/asm-cris/sync_serial.h linux-2.6.19.2.dev/include/asm-cris/sync_serial.h
--- linux-2.6.19.2.old/include/asm-cris/sync_serial.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/sync_serial.h	2005-11-10 15:43:16.000000000 +0100
@@ -1,9 +1,9 @@
-/*
+/*  
  * ioctl defines for synchronous serial port driver
  *
  * Copyright (c) 2001-2003 Axis Communications AB
- *
- * Author: Mikael Starvik
+ * 
+ * Author: Mikael Starvik 
  *
  */
 
@@ -24,7 +24,7 @@
 #define SSP150        0
 #define SSP300        1
 #define SSP600        2
-#define SSP1200       3
+#define SSP1200       3  
 #define SSP2400       4
 #define SSP4800       5
 #define SSP9600       6
@@ -67,6 +67,7 @@
 /* Values for SSP_FRAME_SYNC */
 #define NORMAL_SYNC                1
 #define EARLY_SYNC                 2
+#define SECOND_WORD_SYNC     0x40000
 
 #define BIT_SYNC                   4
 #define WORD_SYNC                  8
@@ -86,6 +87,8 @@
 #define CLOCK_GATED          0x10000
 #define CLOCK_NOT_GATED      0x20000
 
+
+
 /* Values for SSP_IPOLARITY and SSP_OPOLARITY */
 #define CLOCK_NORMAL         1
 #define CLOCK_INVERT         2
diff -urN linux-2.6.19.2.old/include/asm-cris/thread_info.h linux-2.6.19.2.dev/include/asm-cris/thread_info.h
--- linux-2.6.19.2.old/include/asm-cris/thread_info.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/thread_info.h	2006-03-22 11:01:27.000000000 +0100
@@ -32,6 +32,7 @@
 	unsigned long		flags;		/* low level flags */
 	__u32			cpu;		/* current CPU */
 	int			preempt_count;	/* 0 => preemptable, <0 => BUG */
+	__u32			tls;		/* TLS for this thread */
 
 	mm_segment_t		addr_limit;	/* thread address space:
 					 	   0-0xBFFFFFFF for user-thead
@@ -82,6 +83,7 @@
 #define TIF_NOTIFY_RESUME	1	/* resumption notification requested */
 #define TIF_SIGPENDING		2	/* signal pending */
 #define TIF_NEED_RESCHED	3	/* rescheduling necessary */
+#define TIF_RESTORE_SIGMASK     9       /* restore signal mask in do_signal() */
 #define TIF_POLLING_NRFLAG	16	/* true if poll_idle() is polling TIF_NEED_RESCHED */
 #define TIF_MEMDIE		17
 
@@ -89,6 +91,7 @@
 #define _TIF_NOTIFY_RESUME	(1<<TIF_NOTIFY_RESUME)
 #define _TIF_SIGPENDING		(1<<TIF_SIGPENDING)
 #define _TIF_NEED_RESCHED	(1<<TIF_NEED_RESCHED)
+#define _TIF_RESTORE_SIGMASK	(1<<TIF_RESTORE_SIGMASK)
 #define _TIF_POLLING_NRFLAG	(1<<TIF_POLLING_NRFLAG)
 
 #define _TIF_WORK_MASK		0x0000FFFE	/* work to do on interrupt/exception return */
diff -urN linux-2.6.19.2.old/include/asm-cris/unistd.h linux-2.6.19.2.dev/include/asm-cris/unistd.h
--- linux-2.6.19.2.old/include/asm-cris/unistd.h	2007-01-10 20:10:37.000000000 +0100
+++ linux-2.6.19.2.dev/include/asm-cris/unistd.h	2007-01-09 10:31:32.000000000 +0100
@@ -255,6 +255,7 @@
 #define __NR_io_submit		248
 #define __NR_io_cancel		249
 #define __NR_fadvise64		250
+/* 251 is available for reuse (was briefly sys_set_zone_reclaim) */
 #define __NR_exit_group		252
 #define __NR_lookup_dcookie	253
 #define __NR_epoll_create	254
@@ -292,10 +293,41 @@
 #define __NR_add_key		286
 #define __NR_request_key	287
 #define __NR_keyctl		288
+#define __NR_ioprio_set		289
+#define __NR_ioprio_get		290
+#define __NR_inotify_init	291
+#define __NR_inotify_add_watch	292
+#define __NR_inotify_rm_watch	293
+#define __NR_migrate_pages	294
+#define __NR_openat		295
+#define __NR_mkdirat		296
+#define __NR_mknodat		297
+#define __NR_fchownat		298
+#define __NR_futimesat		299
+#define __NR_fstatat64		300
+#define __NR_unlinkat		301
+#define __NR_renameat		302
+#define __NR_linkat		303
+#define __NR_symlinkat		304
+#define __NR_readlinkat		305
+#define __NR_fchmodat		306
+#define __NR_faccessat		307
+#define __NR_pselect6		308
+#define __NR_ppoll		309
+#define __NR_unshare		310
+#define __NR_set_robust_list	311
+#define __NR_get_robust_list	312
+#define __NR_splice		313
+#define __NR_sync_file_range	314
+#define __NR_tee		315
+#define __NR_vmsplice		316 
+#define __NR_move_pages		317
+#define __NR_getcpu		318
+#define __NR_epoll_pwait	319
 
 #ifdef __KERNEL__
 
-#define NR_syscalls 289
+#define NR_syscalls 320
 
 #include <asm/arch/unistd.h>
 
@@ -321,6 +353,7 @@
 #define __ARCH_WANT_SYS_SIGPENDING
 #define __ARCH_WANT_SYS_SIGPROCMASK
 #define __ARCH_WANT_SYS_RT_SIGACTION
+#define __ARCH_WANT_SYS_RT_SIGSUSPEND
 
 /*
  * "Conditional" syscalls