/[linux-patches]/genpatches-2.6/trunk/2.6.12-pre/1000_linux-2.6.11.1.patch
Gentoo

Contents of /genpatches-2.6/trunk/2.6.12-pre/1000_linux-2.6.11.1.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 4 - (show annotations) (download)
Sat Jun 11 23:20:41 2005 UTC (12 years, 4 months ago) by dsd
File size: 1483 byte(s)
Create 2.6.12 branch
1 diff -Nru a/Makefile b/Makefile
2 --- a/Makefile 2005-03-04 09:27:15 -08:00
3 +++ b/Makefile 2005-03-04 09:27:15 -08:00
4 @@ -1,7 +1,7 @@
5 VERSION = 2
6 PATCHLEVEL = 6
7 SUBLEVEL = 11
8 -EXTRAVERSION =
9 +EXTRAVERSION = .1
10 NAME=Woozy Numbat
11
12 # *DOCUMENTATION*
13 diff -Nru a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h
14 --- a/drivers/input/serio/i8042-x86ia64io.h 2005-03-04 09:27:15 -08:00
15 +++ b/drivers/input/serio/i8042-x86ia64io.h 2005-03-04 09:27:15 -08:00
16 @@ -88,7 +88,7 @@
17 };
18 #endif
19
20 -#ifdef CONFIG_ACPI
21 +#if defined(__ia64__) && defined(CONFIG_ACPI)
22 #include <linux/acpi.h>
23 #include <acpi/acpi_bus.h>
24
25 @@ -281,7 +281,7 @@
26 i8042_kbd_irq = I8042_MAP_IRQ(1);
27 i8042_aux_irq = I8042_MAP_IRQ(12);
28
29 -#ifdef CONFIG_ACPI
30 +#if defined(__ia64__) && defined(CONFIG_ACPI)
31 if (i8042_acpi_init())
32 return -1;
33 #endif
34 @@ -300,7 +300,7 @@
35
36 static inline void i8042_platform_exit(void)
37 {
38 -#ifdef CONFIG_ACPI
39 +#if defined(__ia64__) && defined(CONFIG_ACPI)
40 i8042_acpi_exit();
41 #endif
42 }
43 diff -Nru a/drivers/md/raid6altivec.uc b/drivers/md/raid6altivec.uc
44 --- a/drivers/md/raid6altivec.uc 2005-03-04 09:27:15 -08:00
45 +++ b/drivers/md/raid6altivec.uc 2005-03-04 09:27:15 -08:00
46 @@ -108,7 +108,11 @@
47 int raid6_have_altivec(void)
48 {
49 /* This assumes either all CPUs have Altivec or none does */
50 +#ifdef CONFIG_PPC64
51 return cur_cpu_spec->cpu_features & CPU_FTR_ALTIVEC;
52 +#else
53 + return cur_cpu_spec[0]->cpu_features & CPU_FTR_ALTIVEC;
54 +#endif
55 }
56 #endif
57

  ViewVC Help
Powered by ViewVC 1.1.20