Changeset e89ec63 for patches/linux-2.6.19-cobalt_x86-1.patch
- Timestamp:
- Nov 29, 2006, 8:12:03 PM (18 years ago)
- Branches:
- clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
- Children:
- c08883a
- Parents:
- c5d783f
- File:
-
- 1 moved
-
patches/linux-2.6.19-cobalt_x86-1.patch (moved) (moved from patches/linux-2.6.18.3-cobalt_x86-1.patch ) (53 diffs)
Legend:
- Unmodified
- Added
- Removed
-
patches/linux-2.6.19-cobalt_x86-1.patch
rc5d783f re89ec63 1 1 Submitted By: Jim Gifford (patches at jg555 dot com) 2 Date: 2006-11- 153 Initial Package Version: 2.6.1 8.22 Date: 2006-11-29 3 Initial Package Version: 2.6.19 4 4 Origin: Gentoo - Jeff Waters 5 5 Upstream Status: N/A 6 6 Description: Adds Support for the x86 Cobalt Series 7 7 8 diff -Naur linux-2.6.1 8.2.orig/Makefile linux-2.6.18.2/Makefile9 --- linux-2.6.1 8.2.orig/Makefile 2006-11-03 17:33:58.000000000 -080010 +++ linux-2.6.1 8.2/Makefile 2006-11-15 21:20:19.730033585-080011 @@ - 197,6 +197,7 @@8 diff -Naur linux-2.6.19.orig/Makefile linux-2.6.19/Makefile 9 --- linux-2.6.19.orig/Makefile 2006-11-29 13:57:37.000000000 -0800 10 +++ linux-2.6.19/Makefile 2006-11-29 19:13:54.000000000 -0800 11 @@ -203,6 +203,7 @@ 12 12 KBUILD_MODULES := 13 13 KBUILD_BUILTIN := 1 … … 17 17 # When we're building modules with modversions, we need to consider 18 18 # the built-in objects during the descend as well, in order to 19 @@ -70 2,6 +703,11 @@19 @@ -709,6 +710,11 @@ 20 20 cmd_kallsyms = $(NM) -n $< | $(KALLSYMS) \ 21 21 $(if $(CONFIG_KALLSYMS_ALL),--all-symbols) > $@ … … 29 29 $(call if_changed_dep,as_o_S) 30 30 31 diff -Naur linux-2.6.1 8.2.orig/arch/i386/kernel/Makefile linux-2.6.18.2/arch/i386/kernel/Makefile32 --- linux-2.6.1 8.2.orig/arch/i386/kernel/Makefile 2006-11-03 17:33:58.000000000 -080033 +++ linux-2.6.1 8.2/arch/i386/kernel/Makefile 2006-11-15 21:20:19.730033585-080031 diff -Naur linux-2.6.19.orig/arch/i386/kernel/Makefile linux-2.6.19/arch/i386/kernel/Makefile 32 --- linux-2.6.19.orig/arch/i386/kernel/Makefile 2006-11-29 13:57:37.000000000 -0800 33 +++ linux-2.6.19/arch/i386/kernel/Makefile 2006-11-29 19:13:54.000000000 -0800 34 34 @@ -52,6 +52,7 @@ 35 35 targets += vsyscall-note.o vsyscall.lds … … 40 40 cmd_syscall = $(CC) -m elf_i386 -nostdlib $(SYSCFLAGS_$(@F)) \ 41 41 -Wl,-T,$(filter-out FORCE,$^) -o $@ 42 diff -Naur linux-2.6.1 8.2.orig/arch/i386/kernel/cobalt.c linux-2.6.18.2/arch/i386/kernel/cobalt.c43 --- linux-2.6.1 8.2.orig/arch/i386/kernel/cobalt.c 1969-12-31 16:00:00.000000000 -080044 +++ linux-2.6.1 8.2/arch/i386/kernel/cobalt.c 2006-11-15 21:20:19.730033585-080042 diff -Naur linux-2.6.19.orig/arch/i386/kernel/cobalt.c linux-2.6.19/arch/i386/kernel/cobalt.c 43 --- linux-2.6.19.orig/arch/i386/kernel/cobalt.c 1969-12-31 16:00:00.000000000 -0800 44 +++ linux-2.6.19/arch/i386/kernel/cobalt.c 2006-11-29 19:13:54.000000000 -0800 45 45 @@ -0,0 +1,281 @@ 46 46 +/* $Id: cobalt.c,v 1.34 2002/11/04 17:54:14 thockin Exp $ */ … … 325 325 +} 326 326 +module_init(cobalt_arch_init); 327 diff -Naur linux-2.6.1 8.2.orig/arch/i386/kernel/process.c linux-2.6.18.2/arch/i386/kernel/process.c328 --- linux-2.6.1 8.2.orig/arch/i386/kernel/process.c 2006-11-03 17:33:58.000000000 -0800329 +++ linux-2.6.1 8.2/arch/i386/kernel/process.c 2006-11-15 21:28:11.450334183-0800330 @@ -5 1,6 +51,11 @@327 diff -Naur linux-2.6.19.orig/arch/i386/kernel/process.c linux-2.6.19/arch/i386/kernel/process.c 328 --- linux-2.6.19.orig/arch/i386/kernel/process.c 2006-11-29 13:57:37.000000000 -0800 329 +++ linux-2.6.19/arch/i386/kernel/process.c 2006-11-29 19:13:54.000000000 -0800 330 @@ -52,6 +52,11 @@ 331 331 #include <asm/math_emu.h> 332 332 #endif … … 340 340 341 341 #include <asm/tlbflush.h> 342 @@ -48 2,6 +487,12 @@342 @@ -483,6 +488,12 @@ 343 343 void dump_thread(struct pt_regs * regs, struct user * dump) 344 344 { … … 353 353 /* changed the size calculations - should hopefully work better. lbt */ 354 354 dump->magic = CMAGIC; 355 diff -Naur linux-2.6.1 8.2.orig/arch/i386/kernel/reboot.c linux-2.6.18.2/arch/i386/kernel/reboot.c356 --- linux-2.6.1 8.2.orig/arch/i386/kernel/reboot.c 2006-11-03 17:33:58.000000000 -0800357 +++ linux-2.6.1 8.2/arch/i386/kernel/reboot.c 2006-11-15 21:26:57.096812163-0800355 diff -Naur linux-2.6.19.orig/arch/i386/kernel/reboot.c linux-2.6.19/arch/i386/kernel/reboot.c 356 --- linux-2.6.19.orig/arch/i386/kernel/reboot.c 2006-11-29 13:57:37.000000000 -0800 357 +++ linux-2.6.19/arch/i386/kernel/reboot.c 2006-11-29 19:13:54.000000000 -0800 358 358 @@ -18,6 +18,11 @@ 359 359 #include "mach_reboot.h" … … 368 368 * Power off function, if any 369 369 */ 370 @@ -2 83,8 +288,38 @@370 @@ -279,8 +284,38 @@ 371 371 EXPORT_SYMBOL(machine_real_restart); 372 372 #endif … … 407 407 int reboot_cpu_id; 408 408 409 @@ -3 21,6 +356,9 @@409 @@ -317,6 +352,9 @@ 410 410 411 411 void machine_emergency_restart(void) … … 417 417 if (efi_enabled) { 418 418 efi.reset_system(EFI_RESET_COLD, EFI_SUCCESS, 0, NULL); 419 @@ -34 5,6 +383,10 @@419 @@ -341,6 +379,10 @@ 420 420 421 421 void machine_restart(char * __unused) … … 428 428 machine_emergency_restart(); 429 429 } 430 diff -Naur linux-2.6.1 8.2.orig/arch/i386/kernel/traps.c linux-2.6.18.2/arch/i386/kernel/traps.c431 --- linux-2.6.1 8.2.orig/arch/i386/kernel/traps.c 2006-11-03 17:33:58.000000000 -0800432 +++ linux-2.6.1 8.2/arch/i386/kernel/traps.c 2006-11-15 21:20:19.734033452-0800433 @@ -5 6,6 +56,10 @@430 diff -Naur linux-2.6.19.orig/arch/i386/kernel/traps.c linux-2.6.19/arch/i386/kernel/traps.c 431 --- linux-2.6.19.orig/arch/i386/kernel/traps.c 2006-11-29 13:57:37.000000000 -0800 432 +++ linux-2.6.19/arch/i386/kernel/traps.c 2006-11-29 19:15:56.000000000 -0800 433 @@ -59,6 +59,10 @@ 434 434 435 #include "mach_traps.h"435 int panic_on_unrecovered_nmi; 436 436 437 437 +#ifdef CONFIG_COBALT_RAQ … … 442 442 443 443 struct desc_struct default_ldt[] = { { 0, 0 }, { 0, 0 }, { 0, 0 }, 444 @@ - 631,11 +635,14@@445 446 static voidmem_parity_error(unsigned char reason, struct pt_regs * regs)444 @@ -705,6 +709,9 @@ 445 static __kprobes void 446 mem_parity_error(unsigned char reason, struct pt_regs * regs) 447 447 { 448 448 +#ifdef CONFIG_COBALT_RAQ 449 449 + cobalt_nmi(reason, regs); 450 450 +#else 451 printk(KERN_EMERG "Uhhuh. NMI received . Dazed and confused, but trying"452 "to continue\n");451 printk(KERN_EMERG "Uhhuh. NMI received for unknown reason %02x on " 452 "CPU %d.\n", reason, smp_processor_id()); 453 453 printk(KERN_EMERG "You probably have a hardware problem with your RAM " 454 "chips\n"); 454 @@ -713,7 +720,7 @@ 455 panic("NMI: Not continuing"); 456 457 printk(KERN_EMERG "Dazed and confused, but trying to continue\n"); 455 458 - 456 459 +#endif … … 458 461 clear_mem_error(reason); 459 462 } 460 diff -Naur linux-2.6.1 8.2.orig/drivers/Kconfig linux-2.6.18.2/drivers/Kconfig461 --- linux-2.6.1 8.2.orig/drivers/Kconfig 2006-11-03 17:33:58.000000000 -0800462 +++ linux-2.6.1 8.2/drivers/Kconfig 2006-11-15 21:20:19.734033452-0800463 @@ -7 4,4 +74,6 @@463 diff -Naur linux-2.6.19.orig/drivers/Kconfig linux-2.6.19/drivers/Kconfig 464 --- linux-2.6.19.orig/drivers/Kconfig 2006-11-29 13:57:37.000000000 -0800 465 +++ linux-2.6.19/drivers/Kconfig 2006-11-29 19:13:54.000000000 -0800 466 @@ -78,4 +78,6 @@ 464 467 465 468 source "drivers/dma/Kconfig" … … 468 471 + 469 472 endmenu 470 diff -Naur linux-2.6.1 8.2.orig/drivers/Makefile linux-2.6.18.2/drivers/Makefile471 --- linux-2.6.1 8.2.orig/drivers/Makefile 2006-11-03 17:33:58.000000000 -0800472 +++ linux-2.6.1 8.2/drivers/Makefile 2006-11-15 21:20:19.734033452-0800473 @@ -6 5,6 +65,8 @@473 diff -Naur linux-2.6.19.orig/drivers/Makefile linux-2.6.19/drivers/Makefile 474 --- linux-2.6.19.orig/drivers/Makefile 2006-11-29 13:57:37.000000000 -0800 475 +++ linux-2.6.19/drivers/Makefile 2006-11-29 19:13:54.000000000 -0800 476 @@ -66,6 +66,8 @@ 474 477 obj-$(CONFIG_EDAC) += edac/ 475 478 obj-$(CONFIG_MCA) += mca/ … … 480 483 obj-$(CONFIG_MMC) += mmc/ 481 484 obj-$(CONFIG_NEW_LEDS) += leds/ 482 diff -Naur linux-2.6.1 8.2.orig/drivers/char/Kconfig linux-2.6.18.2/drivers/char/Kconfig483 --- linux-2.6.1 8.2.orig/drivers/char/Kconfig 2006-11-03 17:33:58.000000000 -0800484 +++ linux-2.6.1 8.2/drivers/char/Kconfig 2006-11-15 21:20:19.734033452-0800485 @@ - 809,7 +809,7 @@486 Samsung S3C2410. This can provide periodic interrupt rates487 from 1Hz to 64Hz for user programs, and wakeup from Alarm.485 diff -Naur linux-2.6.19.orig/drivers/char/Kconfig linux-2.6.19/drivers/char/Kconfig 486 --- linux-2.6.19.orig/drivers/char/Kconfig 2006-11-29 13:57:37.000000000 -0800 487 +++ linux-2.6.19/drivers/char/Kconfig 2006-11-29 19:13:54.000000000 -0800 488 @@ -793,7 +793,7 @@ 489 will get access to the real time clock (or hardware clock) built 490 into your computer. 488 491 489 492 -config COBALT_LCD … … 492 495 depends on MIPS_COBALT 493 496 help 494 diff -Naur linux-2.6.1 8.2.orig/drivers/char/Makefile linux-2.6.18.2/drivers/char/Makefile495 --- linux-2.6.1 8.2.orig/drivers/char/Makefile 2006-11-03 17:33:58.000000000 -0800496 +++ linux-2.6.1 8.2/drivers/char/Makefile 2006-11-15 21:20:19.734033452-0800497 @@ -7 7,7 +77,7 @@497 diff -Naur linux-2.6.19.orig/drivers/char/Makefile linux-2.6.19/drivers/char/Makefile 498 --- linux-2.6.19.orig/drivers/char/Makefile 2006-11-29 13:57:37.000000000 -0800 499 +++ linux-2.6.19/drivers/char/Makefile 2006-11-29 19:13:54.000000000 -0800 500 @@ -79,7 +79,7 @@ 498 501 obj-$(CONFIG_DS1620) += ds1620.o 499 502 obj-$(CONFIG_HW_RANDOM) += hw_random/ … … 504 507 obj-$(CONFIG_NWBUTTON) += nwbutton.o 505 508 obj-$(CONFIG_NWFLASH) += nwflash.o 506 diff -Naur linux-2.6.1 8.2.orig/drivers/char/misc.c linux-2.6.18.2/drivers/char/misc.c507 --- linux-2.6.1 8.2.orig/drivers/char/misc.c 2006-11-03 17:33:58.000000000 -0800508 +++ linux-2.6.1 8.2/drivers/char/misc.c 2006-11-15 21:20:19.734033452-0800509 diff -Naur linux-2.6.19.orig/drivers/char/misc.c linux-2.6.19/drivers/char/misc.c 510 --- linux-2.6.19.orig/drivers/char/misc.c 2006-11-29 13:57:37.000000000 -0800 511 +++ linux-2.6.19/drivers/char/misc.c 2006-11-29 19:13:54.000000000 -0800 509 512 @@ -49,6 +49,17 @@ 510 513 #include <linux/tty.h> … … 539 542 static void *misc_seq_start(struct seq_file *seq, loff_t *pos) 540 543 { 541 diff -Naur linux-2.6.1 8.2.orig/drivers/char/nvram.c linux-2.6.18.2/drivers/char/nvram.c542 --- linux-2.6.1 8.2.orig/drivers/char/nvram.c 2006-11-03 17:33:58.000000000 -0800543 +++ linux-2.6.1 8.2/drivers/char/nvram.c 2006-11-15 21:20:19.734033452-0800544 diff -Naur linux-2.6.19.orig/drivers/char/nvram.c linux-2.6.19/drivers/char/nvram.c 545 --- linux-2.6.19.orig/drivers/char/nvram.c 2006-11-29 13:57:37.000000000 -0800 546 +++ linux-2.6.19/drivers/char/nvram.c 2006-11-29 19:13:54.000000000 -0800 544 547 @@ -49,8 +49,7 @@ 545 548 #if defined(CONFIG_ATARI) … … 552 555 # define MACH COBALT 553 556 # else 554 diff -Naur linux-2.6.1 8.2.orig/drivers/cobalt/Kconfig linux-2.6.18.2/drivers/cobalt/Kconfig555 --- linux-2.6.1 8.2.orig/drivers/cobalt/Kconfig 1969-12-31 16:00:00.000000000 -0800556 +++ linux-2.6.1 8.2/drivers/cobalt/Kconfig 2006-11-15 21:20:19.734033452-0800557 diff -Naur linux-2.6.19.orig/drivers/cobalt/Kconfig linux-2.6.19/drivers/cobalt/Kconfig 558 --- linux-2.6.19.orig/drivers/cobalt/Kconfig 1969-12-31 16:00:00.000000000 -0800 559 +++ linux-2.6.19/drivers/cobalt/Kconfig 2006-11-29 19:13:54.000000000 -0800 557 560 @@ -0,0 +1,133 @@ 558 561 +# … … 689 692 + 690 693 +endmenu 691 diff -Naur linux-2.6.1 8.2.orig/drivers/cobalt/Makefile linux-2.6.18.2/drivers/cobalt/Makefile692 --- linux-2.6.1 8.2.orig/drivers/cobalt/Makefile 1969-12-31 16:00:00.000000000 -0800693 +++ linux-2.6.1 8.2/drivers/cobalt/Makefile 2006-11-15 21:20:19.734033452-0800694 diff -Naur linux-2.6.19.orig/drivers/cobalt/Makefile linux-2.6.19/drivers/cobalt/Makefile 695 --- linux-2.6.19.orig/drivers/cobalt/Makefile 1969-12-31 16:00:00.000000000 -0800 696 +++ linux-2.6.19/drivers/cobalt/Makefile 2006-11-29 19:13:54.000000000 -0800 694 697 @@ -0,0 +1,18 @@ 695 698 +# … … 711 714 +obj-$(CONFIG_COBALT_RULER) += ruler.o 712 715 + 713 diff -Naur linux-2.6.1 8.2.orig/drivers/cobalt/README linux-2.6.18.2/drivers/cobalt/README714 --- linux-2.6.1 8.2.orig/drivers/cobalt/README 1969-12-31 16:00:00.000000000 -0800715 +++ linux-2.6.1 8.2/drivers/cobalt/README 2006-11-15 21:20:19.734033452-0800716 diff -Naur linux-2.6.19.orig/drivers/cobalt/README linux-2.6.19/drivers/cobalt/README 717 --- linux-2.6.19.orig/drivers/cobalt/README 1969-12-31 16:00:00.000000000 -0800 718 +++ linux-2.6.19/drivers/cobalt/README 2006-11-29 19:13:54.000000000 -0800 716 719 @@ -0,0 +1,19 @@ 717 720 +Notes on Cobalt's drivers: … … 734 737 + 735 738 +-- 736 diff -Naur linux-2.6.1 8.2.orig/drivers/cobalt/acpi.c linux-2.6.18.2/drivers/cobalt/acpi.c737 --- linux-2.6.1 8.2.orig/drivers/cobalt/acpi.c 1969-12-31 16:00:00.000000000 -0800738 +++ linux-2.6.1 8.2/drivers/cobalt/acpi.c 2006-11-15 21:20:19.734033452-0800739 diff -Naur linux-2.6.19.orig/drivers/cobalt/acpi.c linux-2.6.19/drivers/cobalt/acpi.c 740 --- linux-2.6.19.orig/drivers/cobalt/acpi.c 1969-12-31 16:00:00.000000000 -0800 741 +++ linux-2.6.19/drivers/cobalt/acpi.c 2006-11-29 19:13:54.000000000 -0800 739 742 @@ -0,0 +1,1994 @@ 740 743 + /* … … 2732 2735 + 2733 2736 +#endif /* CONFIG_COBALT_EMU_ACPI */ 2734 diff -Naur linux-2.6.1 8.2.orig/drivers/cobalt/fans.c linux-2.6.18.2/drivers/cobalt/fans.c2735 --- linux-2.6.1 8.2.orig/drivers/cobalt/fans.c 1969-12-31 16:00:00.000000000 -08002736 +++ linux-2.6.1 8.2/drivers/cobalt/fans.c 2006-11-15 21:20:19.738033319-08002737 diff -Naur linux-2.6.19.orig/drivers/cobalt/fans.c linux-2.6.19/drivers/cobalt/fans.c 2738 --- linux-2.6.19.orig/drivers/cobalt/fans.c 1969-12-31 16:00:00.000000000 -0800 2739 +++ linux-2.6.19/drivers/cobalt/fans.c 2006-11-29 19:13:54.000000000 -0800 2737 2740 @@ -0,0 +1,419 @@ 2738 2741 +/* $Id: fans.c,v 1.18 2002/03/16 21:33:02 duncan Exp $ … … 3155 3158 + 3156 3159 +#endif /* CONFIG_COBALT_FANS || CONFIG_COBALT_FANS_MODULE */ 3157 diff -Naur linux-2.6.1 8.2.orig/drivers/cobalt/i2c.c linux-2.6.18.2/drivers/cobalt/i2c.c3158 --- linux-2.6.1 8.2.orig/drivers/cobalt/i2c.c 1969-12-31 16:00:00.000000000 -08003159 +++ linux-2.6.1 8.2/drivers/cobalt/i2c.c 2006-11-15 21:20:19.738033319-08003160 diff -Naur linux-2.6.19.orig/drivers/cobalt/i2c.c linux-2.6.19/drivers/cobalt/i2c.c 3161 --- linux-2.6.19.orig/drivers/cobalt/i2c.c 1969-12-31 16:00:00.000000000 -0800 3162 +++ linux-2.6.19/drivers/cobalt/i2c.c 2006-11-29 19:13:54.000000000 -0800 3160 3163 @@ -0,0 +1,519 @@ 3161 3164 +/* … … 3678 3681 +EXPORT_SYMBOL(cobalt_i2c_write_word); 3679 3682 +EXPORT_SYMBOL(cobalt_i2c_write_block); 3680 diff -Naur linux-2.6.1 8.2.orig/drivers/cobalt/init.c linux-2.6.18.2/drivers/cobalt/init.c3681 --- linux-2.6.1 8.2.orig/drivers/cobalt/init.c 1969-12-31 16:00:00.000000000 -08003682 +++ linux-2.6.1 8.2/drivers/cobalt/init.c 2006-11-15 21:20:19.738033319-08003683 diff -Naur linux-2.6.19.orig/drivers/cobalt/init.c linux-2.6.19/drivers/cobalt/init.c 3684 --- linux-2.6.19.orig/drivers/cobalt/init.c 1969-12-31 16:00:00.000000000 -0800 3685 +++ linux-2.6.19/drivers/cobalt/init.c 2006-11-29 19:13:54.000000000 -0800 3683 3686 @@ -0,0 +1,114 @@ 3684 3687 +/* $Id: init.c,v 1.22 2002/11/04 17:54:15 thockin Exp $ */ … … 3796 3799 +} 3797 3800 +EXPORT_SYMBOL(cobalt_gen_proc_read); 3798 diff -Naur linux-2.6.1 8.2.orig/drivers/cobalt/lcd.c linux-2.6.18.2/drivers/cobalt/lcd.c3799 --- linux-2.6.1 8.2.orig/drivers/cobalt/lcd.c 1969-12-31 16:00:00.000000000 -08003800 +++ linux-2.6.1 8.2/drivers/cobalt/lcd.c 2006-11-15 21:20:19.738033319-08003801 diff -Naur linux-2.6.19.orig/drivers/cobalt/lcd.c linux-2.6.19/drivers/cobalt/lcd.c 3802 --- linux-2.6.19.orig/drivers/cobalt/lcd.c 1969-12-31 16:00:00.000000000 -0800 3803 +++ linux-2.6.19/drivers/cobalt/lcd.c 2006-11-29 19:13:54.000000000 -0800 3801 3804 @@ -0,0 +1,835 @@ 3802 3805 +/* … … 4635 4638 + 4636 4639 +#endif /* CONFIG_COBALT_LCD */ 4637 diff -Naur linux-2.6.1 8.2.orig/drivers/cobalt/led.c linux-2.6.18.2/drivers/cobalt/led.c4638 --- linux-2.6.1 8.2.orig/drivers/cobalt/led.c 1969-12-31 16:00:00.000000000 -08004639 +++ linux-2.6.1 8.2/drivers/cobalt/led.c 2006-11-15 21:20:19.738033319-08004640 diff -Naur linux-2.6.19.orig/drivers/cobalt/led.c linux-2.6.19/drivers/cobalt/led.c 4641 --- linux-2.6.19.orig/drivers/cobalt/led.c 1969-12-31 16:00:00.000000000 -0800 4642 +++ linux-2.6.19/drivers/cobalt/led.c 2006-11-29 19:13:54.000000000 -0800 4640 4643 @@ -0,0 +1,504 @@ 4641 4644 + /* … … 5143 5146 + 5144 5147 +#endif /* CONFIG_COBALT_LED */ 5145 diff -Naur linux-2.6.1 8.2.orig/drivers/cobalt/net.c linux-2.6.18.2/drivers/cobalt/net.c5146 --- linux-2.6.1 8.2.orig/drivers/cobalt/net.c 1969-12-31 16:00:00.000000000 -08005147 +++ linux-2.6.1 8.2/drivers/cobalt/net.c 2006-11-15 21:20:19.738033319-08005148 diff -Naur linux-2.6.19.orig/drivers/cobalt/net.c linux-2.6.19/drivers/cobalt/net.c 5149 --- linux-2.6.19.orig/drivers/cobalt/net.c 1969-12-31 16:00:00.000000000 -0800 5150 +++ linux-2.6.19/drivers/cobalt/net.c 2006-11-29 19:13:54.000000000 -0800 5148 5151 @@ -0,0 +1,133 @@ 5149 5152 +/* … … 5280 5283 + return 0; 5281 5284 +} 5282 diff -Naur linux-2.6.1 8.2.orig/drivers/cobalt/raminfo.c linux-2.6.18.2/drivers/cobalt/raminfo.c5283 --- linux-2.6.1 8.2.orig/drivers/cobalt/raminfo.c 1969-12-31 16:00:00.000000000 -08005284 +++ linux-2.6.1 8.2/drivers/cobalt/raminfo.c 2006-11-15 21:20:19.738033319-08005285 diff -Naur linux-2.6.19.orig/drivers/cobalt/raminfo.c linux-2.6.19/drivers/cobalt/raminfo.c 5286 --- linux-2.6.19.orig/drivers/cobalt/raminfo.c 1969-12-31 16:00:00.000000000 -0800 5287 +++ linux-2.6.19/drivers/cobalt/raminfo.c 2006-11-29 19:13:54.000000000 -0800 5285 5288 @@ -0,0 +1,320 @@ 5286 5289 +/* $Id: raminfo.c,v 1.7 2001/10/29 22:21:36 thockin Exp $ … … 5604 5607 + 5605 5608 +#endif /* CONFIG_COBALT_RAMINFO || CONFIG_COBALT_RAMINFO_MODULE */ 5606 diff -Naur linux-2.6.1 8.2.orig/drivers/cobalt/ruler.c linux-2.6.18.2/drivers/cobalt/ruler.c5607 --- linux-2.6.1 8.2.orig/drivers/cobalt/ruler.c 1969-12-31 16:00:00.000000000 -08005608 +++ linux-2.6.1 8.2/drivers/cobalt/ruler.c 2006-11-15 21:20:19.738033319-08005609 diff -Naur linux-2.6.19.orig/drivers/cobalt/ruler.c linux-2.6.19/drivers/cobalt/ruler.c 5610 --- linux-2.6.19.orig/drivers/cobalt/ruler.c 1969-12-31 16:00:00.000000000 -0800 5611 +++ linux-2.6.19/drivers/cobalt/ruler.c 2006-11-29 19:13:54.000000000 -0800 5609 5612 @@ -0,0 +1,419 @@ 5610 5613 +/* … … 6027 6030 + return 0; 6028 6031 +} 6029 diff -Naur linux-2.6.1 8.2.orig/drivers/cobalt/sensors.c linux-2.6.18.2/drivers/cobalt/sensors.c6030 --- linux-2.6.1 8.2.orig/drivers/cobalt/sensors.c 1969-12-31 16:00:00.000000000 -08006031 +++ linux-2.6.1 8.2/drivers/cobalt/sensors.c 2006-11-15 21:20:19.738033319-08006032 diff -Naur linux-2.6.19.orig/drivers/cobalt/sensors.c linux-2.6.19/drivers/cobalt/sensors.c 6033 --- linux-2.6.19.orig/drivers/cobalt/sensors.c 1969-12-31 16:00:00.000000000 -0800 6034 +++ linux-2.6.19/drivers/cobalt/sensors.c 2006-11-29 19:13:54.000000000 -0800 6032 6035 @@ -0,0 +1,525 @@ 6033 6036 +/* $Id: sensors.c,v 1.31 2002/08/29 00:33:01 uzi Exp $ … … 6556 6559 + 6557 6560 +#endif /* CONFIG_COBALT_SENSORS */ 6558 diff -Naur linux-2.6.1 8.2.orig/drivers/cobalt/serialnum.c linux-2.6.18.2/drivers/cobalt/serialnum.c6559 --- linux-2.6.1 8.2.orig/drivers/cobalt/serialnum.c 1969-12-31 16:00:00.000000000 -08006560 +++ linux-2.6.1 8.2/drivers/cobalt/serialnum.c 2006-11-15 21:20:19.742033186-08006561 diff -Naur linux-2.6.19.orig/drivers/cobalt/serialnum.c linux-2.6.19/drivers/cobalt/serialnum.c 6562 --- linux-2.6.19.orig/drivers/cobalt/serialnum.c 1969-12-31 16:00:00.000000000 -0800 6563 +++ linux-2.6.19/drivers/cobalt/serialnum.c 2006-11-29 19:13:54.000000000 -0800 6561 6564 @@ -0,0 +1,453 @@ 6562 6565 +/* $Id: serialnum.c,v 1.15 2001/10/23 20:15:27 thockin Exp $ */ … … 7013 7016 + 7014 7017 +#endif /* CONFIG_COBALT_SERNUM */ 7015 diff -Naur linux-2.6.1 8.2.orig/drivers/cobalt/systype.c linux-2.6.18.2/drivers/cobalt/systype.c7016 --- linux-2.6.1 8.2.orig/drivers/cobalt/systype.c 1969-12-31 16:00:00.000000000 -08007017 +++ linux-2.6.1 8.2/drivers/cobalt/systype.c 2006-11-15 21:20:19.742033186-08007018 diff -Naur linux-2.6.19.orig/drivers/cobalt/systype.c linux-2.6.19/drivers/cobalt/systype.c 7019 --- linux-2.6.19.orig/drivers/cobalt/systype.c 1969-12-31 16:00:00.000000000 -0800 7020 +++ linux-2.6.19/drivers/cobalt/systype.c 2006-11-29 19:13:54.000000000 -0800 7018 7021 @@ -0,0 +1,280 @@ 7019 7022 +/* … … 7297 7300 + return 0; 7298 7301 +} 7299 diff -Naur linux-2.6.1 8.2.orig/drivers/cobalt/wdt.c linux-2.6.18.2/drivers/cobalt/wdt.c7300 --- linux-2.6.1 8.2.orig/drivers/cobalt/wdt.c 1969-12-31 16:00:00.000000000 -08007301 +++ linux-2.6.1 8.2/drivers/cobalt/wdt.c 2006-11-15 21:20:19.742033186-08007302 diff -Naur linux-2.6.19.orig/drivers/cobalt/wdt.c linux-2.6.19/drivers/cobalt/wdt.c 7303 --- linux-2.6.19.orig/drivers/cobalt/wdt.c 1969-12-31 16:00:00.000000000 -0800 7304 +++ linux-2.6.19/drivers/cobalt/wdt.c 2006-11-29 19:13:54.000000000 -0800 7302 7305 @@ -0,0 +1,424 @@ 7303 7306 +/* $Id: wdt.c,v 1.21 2002/07/02 00:38:17 asun Exp $ */ … … 7725 7728 +#endif 7726 7729 +} 7727 diff -Naur linux-2.6.1 8.2.orig/drivers/net/Kconfig linux-2.6.18.2/drivers/net/Kconfig7728 --- linux-2.6.1 8.2.orig/drivers/net/Kconfig 2006-11-03 17:33:58.000000000 -08007729 +++ linux-2.6.1 8.2/drivers/net/Kconfig 2006-11-15 21:20:19.742033186-08007730 @@ -1 486,6 +1486,16 @@7730 diff -Naur linux-2.6.19.orig/drivers/net/Kconfig linux-2.6.19/drivers/net/Kconfig 7731 --- linux-2.6.19.orig/drivers/net/Kconfig 2006-11-29 13:57:37.000000000 -0800 7732 +++ linux-2.6.19/drivers/net/Kconfig 2006-11-29 19:13:54.000000000 -0800 7733 @@ -1516,6 +1516,16 @@ 7731 7734 <file:Documentation/networking/net-modules.txt>. The module 7732 7735 will be called e100. … … 7745 7748 tristate "Mylex EISA LNE390A/B support (EXPERIMENTAL)" 7746 7749 depends on NET_PCI && EISA && EXPERIMENTAL 7747 diff -Naur linux-2.6.1 8.2.orig/drivers/net/e100.c linux-2.6.18.2/drivers/net/e100.c7748 --- linux-2.6.1 8.2.orig/drivers/net/e100.c 2006-11-03 17:33:58.000000000 -08007749 +++ linux-2.6.1 8.2/drivers/net/e100.c 2006-11-15 21:20:19.742033186-08007750 diff -Naur linux-2.6.19.orig/drivers/net/e100.c linux-2.6.19/drivers/net/e100.c 7751 --- linux-2.6.19.orig/drivers/net/e100.c 2006-11-29 13:57:37.000000000 -0800 7752 +++ linux-2.6.19/drivers/net/e100.c 2006-11-29 19:17:22.000000000 -0800 7750 7753 @@ -162,6 +162,7 @@ 7751 #define DRV_VERSION "3.5.1 0-k2"DRV_EXT7754 #define DRV_VERSION "3.5.17-k2"DRV_EXT 7752 7755 #define DRV_DESCRIPTION "Intel(R) PRO/100 Network Driver" 7753 #define DRV_COPYRIGHT "Copyright(c) 1999-200 5Intel Corporation"7756 #define DRV_COPYRIGHT "Copyright(c) 1999-2006 Intel Corporation" 7754 7757 +#define DRV_MODIFIED "Modified by <jeff@404ster.com> to ignore bad EEPROM checksums" 7755 7758 #define PFX DRV_NAME ": " … … 7772 7775 7773 7776 return 0; 7774 @@ -28 76,6 +2883,9 @@7777 @@ -2880,6 +2887,9 @@ 7775 7778 if(((1 << debug) - 1) & NETIF_MSG_DRV) { 7776 7779 printk(KERN_INFO PFX "%s, %s\n", DRV_DESCRIPTION, DRV_VERSION); … … 7780 7783 +#endif 7781 7784 } 7782 return pci_ module_init(&e100_driver);7785 return pci_register_driver(&e100_driver); 7783 7786 } 7784 diff -Naur linux-2.6.1 8.2.orig/include/cobalt/acpi.h linux-2.6.18.2/include/cobalt/acpi.h7785 --- linux-2.6.1 8.2.orig/include/cobalt/acpi.h 1969-12-31 16:00:00.000000000 -08007786 +++ linux-2.6.1 8.2/include/cobalt/acpi.h 2006-11-15 21:20:19.742033186-08007787 diff -Naur linux-2.6.19.orig/include/cobalt/acpi.h linux-2.6.19/include/cobalt/acpi.h 7788 --- linux-2.6.19.orig/include/cobalt/acpi.h 1969-12-31 16:00:00.000000000 -0800 7789 +++ linux-2.6.19/include/cobalt/acpi.h 2006-11-29 19:13:54.000000000 -0800 7787 7790 @@ -0,0 +1,82 @@ 7788 7791 +/* … … 7868 7871 + 7869 7872 +#endif /* COBALT_ACPI_H */ 7870 diff -Naur linux-2.6.1 8.2.orig/include/cobalt/cobalt.h linux-2.6.18.2/include/cobalt/cobalt.h7871 --- linux-2.6.1 8.2.orig/include/cobalt/cobalt.h 1969-12-31 16:00:00.000000000 -08007872 +++ linux-2.6.1 8.2/include/cobalt/cobalt.h 2006-11-15 21:20:19.742033186-08007873 diff -Naur linux-2.6.19.orig/include/cobalt/cobalt.h linux-2.6.19/include/cobalt/cobalt.h 7874 --- linux-2.6.19.orig/include/cobalt/cobalt.h 1969-12-31 16:00:00.000000000 -0800 7875 +++ linux-2.6.19/include/cobalt/cobalt.h 2006-11-29 19:13:54.000000000 -0800 7873 7876 @@ -0,0 +1,58 @@ 7874 7877 +/* $Id: cobalt.h,v 1.16 2002/11/04 17:54:15 thockin Exp $ */ … … 7930 7933 + 7931 7934 +#endif /* !defined(COBALT_H) && defined(CONFIG_COBALT_RAQ) */ 7932 diff -Naur linux-2.6.1 8.2.orig/include/cobalt/i2c.h linux-2.6.18.2/include/cobalt/i2c.h7933 --- linux-2.6.1 8.2.orig/include/cobalt/i2c.h 1969-12-31 16:00:00.000000000 -08007934 +++ linux-2.6.1 8.2/include/cobalt/i2c.h 2006-11-15 21:20:19.742033186-08007935 diff -Naur linux-2.6.19.orig/include/cobalt/i2c.h linux-2.6.19/include/cobalt/i2c.h 7936 --- linux-2.6.19.orig/include/cobalt/i2c.h 1969-12-31 16:00:00.000000000 -0800 7937 +++ linux-2.6.19/include/cobalt/i2c.h 2006-11-29 19:13:54.000000000 -0800 7935 7938 @@ -0,0 +1,40 @@ 7936 7939 +/* … … 7974 7977 + 7975 7978 +#endif /* COBALT_I2C_H */ 7976 diff -Naur linux-2.6.1 8.2.orig/include/cobalt/lcd.h linux-2.6.18.2/include/cobalt/lcd.h7977 --- linux-2.6.1 8.2.orig/include/cobalt/lcd.h 1969-12-31 16:00:00.000000000 -08007978 +++ linux-2.6.1 8.2/include/cobalt/lcd.h 2006-11-15 21:20:19.742033186-08007979 diff -Naur linux-2.6.19.orig/include/cobalt/lcd.h linux-2.6.19/include/cobalt/lcd.h 7980 --- linux-2.6.19.orig/include/cobalt/lcd.h 1969-12-31 16:00:00.000000000 -0800 7981 +++ linux-2.6.19/include/cobalt/lcd.h 2006-11-29 19:13:54.000000000 -0800 7979 7982 @@ -0,0 +1,95 @@ 7980 7983 +/* … … 8073 8076 + 8074 8077 +#endif /* COBALT_LCD_H */ 8075 diff -Naur linux-2.6.1 8.2.orig/include/cobalt/led.h linux-2.6.18.2/include/cobalt/led.h8076 --- linux-2.6.1 8.2.orig/include/cobalt/led.h 1969-12-31 16:00:00.000000000 -08008077 +++ linux-2.6.1 8.2/include/cobalt/led.h 2006-11-15 21:20:19.742033186-08008078 diff -Naur linux-2.6.19.orig/include/cobalt/led.h linux-2.6.19/include/cobalt/led.h 8079 --- linux-2.6.19.orig/include/cobalt/led.h 1969-12-31 16:00:00.000000000 -0800 8080 +++ linux-2.6.19/include/cobalt/led.h 2006-11-29 19:13:54.000000000 -0800 8078 8081 @@ -0,0 +1,59 @@ 8079 8082 +/* … … 8136 8139 +#endif /* COBALT_LED_H */ 8137 8140 + 8138 diff -Naur linux-2.6.1 8.2.orig/include/cobalt/misc.h linux-2.6.18.2/include/cobalt/misc.h8139 --- linux-2.6.1 8.2.orig/include/cobalt/misc.h 1969-12-31 16:00:00.000000000 -08008140 +++ linux-2.6.1 8.2/include/cobalt/misc.h 2006-11-15 21:27:17.024148165-08008141 diff -Naur linux-2.6.19.orig/include/cobalt/misc.h linux-2.6.19/include/cobalt/misc.h 8142 --- linux-2.6.19.orig/include/cobalt/misc.h 1969-12-31 16:00:00.000000000 -0800 8143 +++ linux-2.6.19/include/cobalt/misc.h 2006-11-29 19:13:54.000000000 -0800 8141 8144 @@ -0,0 +1,12 @@ 8142 8145 +/* $Id: cobalt-misc.h,v 1.1 2001/04/04 03:36:43 thockin Exp $ */ … … 8152 8155 + 8153 8156 +#endif 8154 diff -Naur linux-2.6.1 8.2.orig/include/cobalt/net.h linux-2.6.18.2/include/cobalt/net.h8155 --- linux-2.6.1 8.2.orig/include/cobalt/net.h 1969-12-31 16:00:00.000000000 -08008156 +++ linux-2.6.1 8.2/include/cobalt/net.h 2006-11-15 21:20:19.746033053-08008157 diff -Naur linux-2.6.19.orig/include/cobalt/net.h linux-2.6.19/include/cobalt/net.h 8158 --- linux-2.6.19.orig/include/cobalt/net.h 1969-12-31 16:00:00.000000000 -0800 8159 +++ linux-2.6.19/include/cobalt/net.h 2006-11-29 19:13:54.000000000 -0800 8157 8160 @@ -0,0 +1,12 @@ 8158 8161 +/* $Id: cobalt-net.h,v 1.3 2002/10/25 01:02:42 thockin Exp $ */ … … 8168 8171 + 8169 8172 +#endif 8170 diff -Naur linux-2.6.1 8.2.orig/include/cobalt/nvram.h linux-2.6.18.2/include/cobalt/nvram.h8171 --- linux-2.6.1 8.2.orig/include/cobalt/nvram.h 1969-12-31 16:00:00.000000000 -08008172 +++ linux-2.6.1 8.2/include/cobalt/nvram.h 2006-11-15 21:20:19.746033053-08008173 diff -Naur linux-2.6.19.orig/include/cobalt/nvram.h linux-2.6.19/include/cobalt/nvram.h 8174 --- linux-2.6.19.orig/include/cobalt/nvram.h 1969-12-31 16:00:00.000000000 -0800 8175 +++ linux-2.6.19/include/cobalt/nvram.h 2006-11-29 19:13:54.000000000 -0800 8173 8176 @@ -0,0 +1,125 @@ 8174 8177 +/* … … 8297 8300 + 8298 8301 +#endif /* COBALT_NVRAM_H */ 8299 diff -Naur linux-2.6.1 8.2.orig/include/cobalt/ruler.h linux-2.6.18.2/include/cobalt/ruler.h8300 --- linux-2.6.1 8.2.orig/include/cobalt/ruler.h 1969-12-31 16:00:00.000000000 -08008301 +++ linux-2.6.1 8.2/include/cobalt/ruler.h 2006-11-15 21:20:19.746033053-08008302 diff -Naur linux-2.6.19.orig/include/cobalt/ruler.h linux-2.6.19/include/cobalt/ruler.h 8303 --- linux-2.6.19.orig/include/cobalt/ruler.h 1969-12-31 16:00:00.000000000 -0800 8304 +++ linux-2.6.19/include/cobalt/ruler.h 2006-11-29 19:13:54.000000000 -0800 8302 8305 @@ -0,0 +1,15 @@ 8303 8306 +/* $Id: cobalt-ruler.h,v 1.4 2001/06/08 20:46:44 thockin Exp $ */ … … 8316 8319 + 8317 8320 +#endif 8318 diff -Naur linux-2.6.1 8.2.orig/include/cobalt/sensors.h linux-2.6.18.2/include/cobalt/sensors.h8319 --- linux-2.6.1 8.2.orig/include/cobalt/sensors.h 1969-12-31 16:00:00.000000000 -08008320 +++ linux-2.6.1 8.2/include/cobalt/sensors.h 2006-11-15 21:20:19.746033053-08008321 diff -Naur linux-2.6.19.orig/include/cobalt/sensors.h linux-2.6.19/include/cobalt/sensors.h 8322 --- linux-2.6.19.orig/include/cobalt/sensors.h 1969-12-31 16:00:00.000000000 -0800 8323 +++ linux-2.6.19/include/cobalt/sensors.h 2006-11-29 19:13:54.000000000 -0800 8321 8324 @@ -0,0 +1,29 @@ 8322 8325 +/* $Id: cobalt-sensors.h,v 1.2 2001/09/25 18:10:29 thockin Exp $ */ … … 8349 8352 + 8350 8353 +#endif 8351 diff -Naur linux-2.6.1 8.2.orig/include/cobalt/serialnum.h linux-2.6.18.2/include/cobalt/serialnum.h8352 --- linux-2.6.1 8.2.orig/include/cobalt/serialnum.h 1969-12-31 16:00:00.000000000 -08008353 +++ linux-2.6.1 8.2/include/cobalt/serialnum.h 2006-11-15 21:20:19.746033053-08008354 diff -Naur linux-2.6.19.orig/include/cobalt/serialnum.h linux-2.6.19/include/cobalt/serialnum.h 8355 --- linux-2.6.19.orig/include/cobalt/serialnum.h 1969-12-31 16:00:00.000000000 -0800 8356 +++ linux-2.6.19/include/cobalt/serialnum.h 2006-11-29 19:13:54.000000000 -0800 8354 8357 @@ -0,0 +1,16 @@ 8355 8358 +/* … … 8369 8372 + 8370 8373 +#endif /* COBALT_SERIALNUM_H */ 8371 diff -Naur linux-2.6.1 8.2.orig/include/cobalt/superio.h linux-2.6.18.2/include/cobalt/superio.h8372 --- linux-2.6.1 8.2.orig/include/cobalt/superio.h 1969-12-31 16:00:00.000000000 -08008373 +++ linux-2.6.1 8.2/include/cobalt/superio.h 2006-11-15 21:20:19.766032388-08008374 diff -Naur linux-2.6.19.orig/include/cobalt/superio.h linux-2.6.19/include/cobalt/superio.h 8375 --- linux-2.6.19.orig/include/cobalt/superio.h 1969-12-31 16:00:00.000000000 -0800 8376 +++ linux-2.6.19/include/cobalt/superio.h 2006-11-29 19:13:54.000000000 -0800 8374 8377 @@ -0,0 +1,225 @@ 8375 8378 +/* … … 8598 8601 + 8599 8602 +#endif /* COBALT_SUPERIO_H */ 8600 diff -Naur linux-2.6.1 8.2.orig/include/cobalt/systype.h linux-2.6.18.2/include/cobalt/systype.h8601 --- linux-2.6.1 8.2.orig/include/cobalt/systype.h 1969-12-31 16:00:00.000000000 -08008602 +++ linux-2.6.1 8.2/include/cobalt/systype.h 2006-11-15 21:20:19.766032388-08008603 diff -Naur linux-2.6.19.orig/include/cobalt/systype.h linux-2.6.19/include/cobalt/systype.h 8604 --- linux-2.6.19.orig/include/cobalt/systype.h 1969-12-31 16:00:00.000000000 -0800 8605 +++ linux-2.6.19/include/cobalt/systype.h 2006-11-29 19:13:54.000000000 -0800 8603 8606 @@ -0,0 +1,99 @@ 8604 8607 +/* … … 8701 8704 + 8702 8705 +#endif 8703 diff -Naur linux-2.6.1 8.2.orig/include/cobalt/wdt.h linux-2.6.18.2/include/cobalt/wdt.h8704 --- linux-2.6.1 8.2.orig/include/cobalt/wdt.h 1969-12-31 16:00:00.000000000 -08008705 +++ linux-2.6.1 8.2/include/cobalt/wdt.h 2006-11-15 21:20:19.766032388-08008706 diff -Naur linux-2.6.19.orig/include/cobalt/wdt.h linux-2.6.19/include/cobalt/wdt.h 8707 --- linux-2.6.19.orig/include/cobalt/wdt.h 1969-12-31 16:00:00.000000000 -0800 8708 +++ linux-2.6.19/include/cobalt/wdt.h 2006-11-29 19:13:54.000000000 -0800 8706 8709 @@ -0,0 +1,16 @@ 8707 8710 +/* $Id: cobalt-wdt.h,v 1.1 2001/03/07 01:58:24 thockin Exp $ */ … … 8721 8724 + 8722 8725 +#endif 8723 diff -Naur linux-2.6.1 8.2.orig/init/main.c linux-2.6.18.2/init/main.c8724 --- linux-2.6.1 8.2.orig/init/main.c 2006-11-03 17:33:58.000000000 -08008725 +++ linux-2.6.1 8.2/init/main.c 2006-11-15 21:20:19.770032256-08008726 @@ -6 50,6 +650,10 @@8726 diff -Naur linux-2.6.19.orig/init/main.c linux-2.6.19/init/main.c 8727 --- linux-2.6.19.orig/init/main.c 2006-11-29 13:57:37.000000000 -0800 8728 +++ linux-2.6.19/init/main.c 2006-11-29 19:13:54.000000000 -0800 8729 @@ -673,6 +673,10 @@ 8727 8730 * 8728 8731 * Now we can finally start doing some real work.. … … 8735 8738 { 8736 8739 /* drivers will send hotplug events */ 8737 @@ -6 62,6 +666,10 @@8740 @@ -685,6 +689,10 @@ 8738 8741 #endif 8739 8742
Note:
See TracChangeset
for help on using the changeset viewer.
