--- /dev/null
+From 09a35ce00fa6bbb8bd130a828807e237488aa7ea Mon Sep 17 00:00:00 2001
+From: Greg Kroah-Hartman <gregkh@suse.de>
+Date: Sat, 6 Dec 2008 21:10:51 -0800
+Subject: xilinx_hwicap: remove improper wording in license statement
+
+From: Greg Kroah-Hartman <gregkh@suse.de>
+
+commit 09a35ce00fa6bbb8bd130a828807e237488aa7ea upstream.
+
+GPLv2 doesn't allow additional restrictions to be imposed on any
+code, so this wording needs to be removed from these files.
+
+Signed-off-by: Stephen Neuendorffer <stephen.neuendorffer@xilinx.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/char/xilinx_hwicap/buffer_icap.c | 3 ---
+ drivers/char/xilinx_hwicap/buffer_icap.h | 3 ---
+ drivers/char/xilinx_hwicap/fifo_icap.c | 3 ---
+ drivers/char/xilinx_hwicap/fifo_icap.h | 3 ---
+ drivers/char/xilinx_hwicap/xilinx_hwicap.c | 3 ---
+ drivers/char/xilinx_hwicap/xilinx_hwicap.h | 3 ---
+ 6 files changed, 18 deletions(-)
+
+--- a/drivers/char/xilinx_hwicap/buffer_icap.c
++++ b/drivers/char/xilinx_hwicap/buffer_icap.c
+@@ -21,9 +21,6 @@
+ * INFRINGEMENT, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE.
+ *
+- * Xilinx products are not intended for use in life support appliances,
+- * devices, or systems. Use in such applications is expressly prohibited.
+- *
+ * (c) Copyright 2003-2008 Xilinx Inc.
+ * All rights reserved.
+ *
+--- a/drivers/char/xilinx_hwicap/buffer_icap.h
++++ b/drivers/char/xilinx_hwicap/buffer_icap.h
+@@ -21,9 +21,6 @@
+ * INFRINGEMENT, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE.
+ *
+- * Xilinx products are not intended for use in life support appliances,
+- * devices, or systems. Use in such applications is expressly prohibited.
+- *
+ * (c) Copyright 2003-2008 Xilinx Inc.
+ * All rights reserved.
+ *
+--- a/drivers/char/xilinx_hwicap/fifo_icap.c
++++ b/drivers/char/xilinx_hwicap/fifo_icap.c
+@@ -21,9 +21,6 @@
+ * INFRINGEMENT, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE.
+ *
+- * Xilinx products are not intended for use in life support appliances,
+- * devices, or systems. Use in such applications is expressly prohibited.
+- *
+ * (c) Copyright 2007-2008 Xilinx Inc.
+ * All rights reserved.
+ *
+--- a/drivers/char/xilinx_hwicap/fifo_icap.h
++++ b/drivers/char/xilinx_hwicap/fifo_icap.h
+@@ -21,9 +21,6 @@
+ * INFRINGEMENT, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE.
+ *
+- * Xilinx products are not intended for use in life support appliances,
+- * devices, or systems. Use in such applications is expressly prohibited.
+- *
+ * (c) Copyright 2007-2008 Xilinx Inc.
+ * All rights reserved.
+ *
+--- a/drivers/char/xilinx_hwicap/xilinx_hwicap.c
++++ b/drivers/char/xilinx_hwicap/xilinx_hwicap.c
+@@ -21,9 +21,6 @@
+ * INFRINGEMENT, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE.
+ *
+- * Xilinx products are not intended for use in life support appliances,
+- * devices, or systems. Use in such applications is expressly prohibited.
+- *
+ * (c) Copyright 2002 Xilinx Inc., Systems Engineering Group
+ * (c) Copyright 2004 Xilinx Inc., Systems Engineering Group
+ * (c) Copyright 2007-2008 Xilinx Inc.
+--- a/drivers/char/xilinx_hwicap/xilinx_hwicap.h
++++ b/drivers/char/xilinx_hwicap/xilinx_hwicap.h
+@@ -21,9 +21,6 @@
+ * INFRINGEMENT, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE.
+ *
+- * Xilinx products are not intended for use in life support appliances,
+- * devices, or systems. Use in such applications is expressly prohibited.
+- *
+ * (c) Copyright 2003-2007 Xilinx Inc.
+ * All rights reserved.
+ *