]> git.pld-linux.org Git - packages/kernel.git/blame - 2.6.1-all-in-1.patch
projects / packages / kernel.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- obsolete
[packages/kernel.git] / 2.6.1-all-in-1.patch
CommitLineData
b37883da 1diff -Naur --exclude '*.orig' --exclude '*.rej' linux-2.6.1-gentoo/arch/i386/Kconfig linux-2.6.1-gentoo-test/arch/i386/Kconfig
2--- linux-2.6.1-gentoo/arch/i386/Kconfig 2004-01-09 23:40:12.000000000 +0000
3+++ linux-2.6.1-gentoo-test/arch/i386/Kconfig 2004-01-09 22:33:09.000000000 +0000
4@@ -586,6 +586,9 @@
5 Say Y if you intend to run this kernel on a Dell Inspiron 8000.
6 Say N otherwise.
7
8+config OMNIBOOK
9+ tristate "HP Omnibook Support"
10+
11 config MICROCODE
12 tristate "/dev/cpu/microcode - Intel IA32 CPU microcode support"
13 ---help---
14diff -Naur --exclude '*.orig' --exclude '*.rej' linux-2.6.1-gentoo/arch/i386/kernel/cpu/cpufreq/powernow-k7.c linux-2.6.1-gentoo-test/arch/i386/kernel/cpu/cpufreq/powernow-k7.c
15--- linux-2.6.1-gentoo/arch/i386/kernel/cpu/cpufreq/powernow-k7.c 2004-01-09 23:40:12.000000000 +0000
16+++ linux-2.6.1-gentoo-test/arch/i386/kernel/cpu/cpufreq/powernow-k7.c 2004-01-09 22:32:23.000000000 +0000
17@@ -279,6 +279,8 @@
18 etuple &= 0xf00;
19 etuple |= (c->x86_model<<4)|(c->x86_mask);
20
21+ if (etuple == 0x7a0) { etuple = 0x781; }
22+
23 for (i=0xC0000; i < 0xffff0 ; i+=16) {
24
25 p = phys_to_virt(i);
26diff -Naur --exclude '*.orig' --exclude '*.rej' linux-2.6.1-gentoo/drivers/char/Makefile linux-2.6.1-gentoo-test/drivers/char/Makefile
27--- linux-2.6.1-gentoo/drivers/char/Makefile 2004-01-09 23:40:12.000000000 +0000
28+++ linux-2.6.1-gentoo-test/drivers/char/Makefile 2004-01-09 22:33:09.000000000 +0000
29@@ -61,6 +61,7 @@
30 endif
31 obj-$(CONFIG_TOSHIBA) += toshiba.o
32 obj-$(CONFIG_I8K) += i8k.o
33+obj-$(CONFIG_OMNIBOOK) += omnibook/
34 obj-$(CONFIG_DS1620) += ds1620.o
35 obj-$(CONFIG_HW_RANDOM) += hw_random.o
36 obj-$(CONFIG_QIC02_TAPE) += tpqic02.o
b37883da 37diff -Naur --exclude '*.orig' --exclude '*.rej' linux-2.6.1-gentoo/drivers/char/drm/radeon_drv.h linux-2.6.1-gentoo-test/drivers/char/drm/radeon_drv.h
38--- linux-2.6.1-gentoo/drivers/char/drm/radeon_drv.h 2004-01-09 23:40:12.000000000 +0000
39+++ linux-2.6.1-gentoo-test/drivers/char/drm/radeon_drv.h 2004-01-09 22:32:40.000000000 +0000
40@@ -125,6 +125,7 @@
41
42 drm_radeon_depth_clear_t depth_clear;
43
44+ unsigned long fb_base;
45 unsigned long fb_offset;
46 unsigned long mmio_offset;
47 unsigned long ring_offset;
48@@ -146,7 +147,6 @@
49 /* SW interrupt */
50 wait_queue_head_t swi_queue;
51 atomic_t swi_emitted;
52-
53 } drm_radeon_private_t;
54
55 typedef struct drm_radeon_buf_priv {
56diff -Naur --exclude '*.orig' --exclude '*.rej' linux-2.6.1-gentoo/drivers/char/drm/radeon_state.c linux-2.6.1-gentoo-test/drivers/char/drm/radeon_state.c
57--- linux-2.6.1-gentoo/drivers/char/drm/radeon_state.c 2004-01-09 23:40:12.000000000 +0000
58+++ linux-2.6.1-gentoo-test/drivers/char/drm/radeon_state.c 2004-01-09 22:32:40.000000000 +0000
59@@ -153,7 +153,7 @@
60 OUT_RING( CP_PACKET0( RADEON_PP_TXFILTER_0, 5 ) );
61 OUT_RING( tex[0].pp_txfilter );
62 OUT_RING( tex[0].pp_txformat );
63- OUT_RING( tex[0].pp_txoffset );
64+ OUT_RING( tex[0].pp_txoffset + dev_priv->fb_base);
65 OUT_RING( tex[0].pp_txcblend );
66 OUT_RING( tex[0].pp_txablend );
67 OUT_RING( tex[0].pp_tfactor );
68@@ -167,7 +167,7 @@
69 OUT_RING( CP_PACKET0( RADEON_PP_TXFILTER_1, 5 ) );
70 OUT_RING( tex[1].pp_txfilter );
71 OUT_RING( tex[1].pp_txformat );
72- OUT_RING( tex[1].pp_txoffset );
73+ OUT_RING( tex[1].pp_txoffset + dev_priv->fb_base);
74 OUT_RING( tex[1].pp_txcblend );
75 OUT_RING( tex[1].pp_txablend );
76 OUT_RING( tex[1].pp_tfactor );
77@@ -181,7 +181,7 @@
78 OUT_RING( CP_PACKET0( RADEON_PP_TXFILTER_2, 5 ) );
79 OUT_RING( tex[2].pp_txfilter );
80 OUT_RING( tex[2].pp_txformat );
81- OUT_RING( tex[2].pp_txoffset );
82+ OUT_RING( tex[2].pp_txoffset + dev_priv->fb_base);
83 OUT_RING( tex[2].pp_txcblend );
84 OUT_RING( tex[2].pp_txablend );
85 OUT_RING( tex[2].pp_tfactor );
86@@ -1178,7 +1178,7 @@
87 RADEON_GMC_CLR_CMP_CNTL_DIS |
88 RADEON_GMC_WR_MSK_DIS);
89
90- buffer[2] = (tex->pitch << 22) | (tex->offset >> 10);
91+ buffer[2] = (tex->pitch << 22) | ((tex->offset + dev_priv->fb_base) >> 10);
92 buffer[3] = 0xffffffff;
93 buffer[4] = 0xffffffff;
94 buffer[5] = (image->y << 16) | image->x;
95diff -Naur --exclude '*.orig' --exclude '*.rej' linux-2.6.1-gentoo/drivers/char/omnibook/Makefile linux-2.6.1-gentoo-test/drivers/char/omnibook/Makefile
96--- linux-2.6.1-gentoo/drivers/char/omnibook/Makefile 1970-01-01 01:00:00.000000000 +0100
97+++ linux-2.6.1-gentoo-test/drivers/char/omnibook/Makefile 2004-01-09 22:33:10.000000000 +0000
98@@ -0,0 +1,37 @@
99+#
100+# Makefile -- makefile for the HP OmniBook support module
101+#
102+# This program is free software; you can redistribute it and/or modify it
103+# under the terms of the GNU General Public License as published by the
104+# Free Software Foundation; either version 2, or (at your option) any
105+# later version.
106+#
107+# This program is distributed in the hope that it will be useful, but
108+# WITHOUT ANY WARRANTY; without even the implied warranty of
109+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
110+# General Public License for more details.
111+#
112