# HG changeset patch
# User diego
# Date 1174122441 0
# Node ID 6d257bd87fce5e5d5b9881db10924da9f3af815e
# Parent  e31e2699d9c1a67d5aebb255bfe8b956db996328
Merge README.linux.2.6 into general README.

diff -r e31e2699d9c1 -r 6d257bd87fce drivers/README
--- a/drivers/README	Sat Mar 17 09:02:00 2007 +0000
+++ b/drivers/README	Sat Mar 17 09:07:21 2007 +0000
@@ -1,3 +1,8 @@
+The code in this directory is the old mga_vid driver for Linux kernels
+prior to 2.6. It does _not_ compile for version 2.6.x.
+
+For Linux kernel 2.6.x please get the newest version of the 2.6 port from
+http://attila.kinali.ch/mga/
 
 mga_vid  -  MGA G200/G400 YUV Overlay kernel module
 
diff -r e31e2699d9c1 -r 6d257bd87fce drivers/README.linux.2.6
--- a/drivers/README.linux.2.6	Sat Mar 17 09:02:00 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-The code in this directory is the old mga_vid driver for
-linux kernel versions 2.0.x, 2.2.x and 2.4.x. It _does_not_
-compile for version 2.6.
-
-For linux kernel 2.6.x please get the newest version of
-the 2.6 port from http://attila.kinali.ch/mga/