From d40f474572307ba53b5f48122782f72d6eb241d3 Mon Sep 17 00:00:00 2001
From: Daniel Jahre <rock@lospalmos.net>
Date: Fri, 25 Nov 2005 17:22:12 +0000
Subject: [PATCH] Daniel Jahre: 	updated linux to version 2.6.14

[2005110215124806195] (https://www.rocklinux.net/submaster)



git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@6650 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 package/base/linux/linux.desc                 |  6 ++--
 .../linux/linux26/71-videodev-h-__user.patch  | 29 -------------------
 .../linux/linux26/85-linux-joystick_h.patch   | 17 -----------
 3 files changed, 3 insertions(+), 49 deletions(-)
 delete mode 100644 package/base/linux/linux26/71-videodev-h-__user.patch
 delete mode 100644 package/base/linux/linux26/85-linux-joystick_h.patch

diff --git a/package/base/linux/linux.desc b/package/base/linux/linux.desc
index 81fb3a515..5dbaccce7 100644
--- a/package/base/linux/linux.desc
+++ b/package/base/linux/linux.desc
@@ -51,9 +51,9 @@
 #endif
 
 #if xpkg == linux26.*
-[V] 2.6.13.4
-[D] 0 linux-2.6.13.4.tar.bz2 ftp://ftp.kernel.org/pub/linux/kernel/v2.6/
-[D] 0 patch-2.6.13-pa4.gz http://cvs.parisc-linux.org/download/linux-2.6/
+[V] 2.6.14
+[D] 0 linux-2.6.14.tar.bz2 ftp://ftp.kernel.org/pub/linux/kernel/v2.6/
+[D] 0 patch-2.6.14-pa0.gz http://cvs.parisc-linux.org/download/linux-2.6/
 #endif
 
 [CD] <COPY> for x in $cachedir/linux2[46].cache; do cp $x $confdir/$pkg.cache; done
diff --git a/package/base/linux/linux26/71-videodev-h-__user.patch b/package/base/linux/linux26/71-videodev-h-__user.patch
deleted file mode 100644
index 2830cd9c0..000000000
--- a/package/base/linux/linux26/71-videodev-h-__user.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/base/linux/linux26/71-videodev-h-__user.patch
-# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf
-# 
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-
---- ./include/linux/videodev.h.orig	2004-09-25 13:51:51.701259400 +0200
-+++ ./include/linux/videodev.h	2004-09-25 13:52:05.029233240 +0200
-@@ -3,6 +3,7 @@
- 
- #include <linux/types.h>
- #include <linux/version.h>
-+#include <linux/compiler.h>
- 
- #define HAVE_V4L2 1
- #include <linux/videodev2.h>
diff --git a/package/base/linux/linux26/85-linux-joystick_h.patch b/package/base/linux/linux26/85-linux-joystick_h.patch
deleted file mode 100644
index 5acba9324..000000000
--- a/package/base/linux/linux26/85-linux-joystick_h.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- linux/include/linux/joystick.h~	2005-10-19 20:35:13.000000000 +0200
-+++ linux/include/linux/joystick.h	2005-10-20 20:41:04.000000000 +0200
-@@ -134,6 +134,7 @@
- 	struct JS_DATA_TYPE JS_CORR;
- };
- 
-+#ifdef __KERNEL__
- #if BITS_PER_LONG == 64
- #define JS_DATA_SAVE_TYPE JS_DATA_SAVE_TYPE_64
- #elif BITS_PER_LONG == 32
-@@ -141,5 +142,6 @@
- #else
- #error Unexpected BITS_PER_LONG
- #endif
-+#endif /* __KERNEL__ */
- 
- #endif /* _LINUX_JOYSTICK_H */