- fix for kernels 2.6.34+

Changed files:
    fglrx-2.6.34-rc4.patch -> 1.1
    xorg-driver-video-fglrx.spec -> 1.171

diff --git a/fglrx-2.6.34-rc4.patch b/fglrx-2.6.34-rc4.patch
new file mode 100644 (file)
index 0000000..b8468c0
--- /dev/null
+++ b/fglrx-2.6.34-rc4.patch
@@ -0,0 +1,10 @@
+--- xorg-driver-video-fglrx-10.6/common/lib/modules/fglrx/build_mod/kcl_wait.c.orig    2010-04-13 20:02:46.494496561 +0200
++++ xorg-driver-video-fglrx-10.6/common/lib/modules/fglrx/build_mod/kcl_wait.c 2010-04-13 19:52:00.054563389 +0200
+@@ -39,6 +39,7 @@
+ #include <linux/wait.h>
+ #include <linux/highmem.h>
+ #include <linux/sched.h>
++#include <linux/slab.h>
+
+ #include "kcl_config.h"
+ #include "kcl_wait.h"

diff --git a/xorg-driver-video-fglrx.spec b/xorg-driver-video-fglrx.spec
index e71bc223ed91af4ed2217f25ad3438e531d23c3d..b825aa2795bacd166e100027f89b907a7e381925 100644 (file)
--- a/xorg-driver-video-fglrx.spec
+++ b/xorg-driver-video-fglrx.spec
@@ -43,6 +43,7 @@ Source1:      %{pname}.desktop
 Patch0:                %{pname}-kh.patch
 Patch1:                %{pname}-smp.patch
 Patch2:                %{pname}-x86genericarch.patch
+Patch3:                fglrx-2.6.34-rc4.patch
 URL:           http://ati.amd.com/support/drivers/linux/linux-radeon.html
 %{?with_userspace:BuildRequires:       OpenGL-GLU-devel}
 %{?with_dist_kernel:BuildRequires:     kernel%{_alt_kernel}-module-build >= 3:2.6.20.2}
@@ -164,6 +165,7 @@ cd common
 %patch1 -p0
 %patch2 -p0
 %endif
+%patch3 -p2
 cd -
 
 install -d common%{_prefix}/{%{_lib},bin,sbin}