removed driver patches in mainline

5 files changed, 0 insertions, 351 deletions

diff --git a/driver/added-uri-of-linux-kernel-development-process.patch b/driver/added-uri-of-linux-kernel-development-process.patch
deleted file mode 100644
index 9d1a6d3a62ff5..0000000000000
--- a/driver/added-uri-of-linux-kernel-development-process.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From paolo.ciarrocchi@gmail.com  Tue Apr 25 14:58:08 2006
-Message-ID: <4d8e3fd30604251347t4a3fb7b2id61496583553ff84@mail.gmail.com>
-Date: Tue, 25 Apr 2006 22:47:51 +0200
-From: "Paolo Ciarrocchi" <paolo.ciarrocchi@gmail.com>
-To: "Greg KH" <greg@kroah.com>
-Subject: Added URI of "linux kernel development process"
-Content-Disposition: inline
-
-
-Signed-off-by: Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- Documentation/HOWTO |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- gregkh-2.6.orig/Documentation/HOWTO
-+++ gregkh-2.6/Documentation/HOWTO
-@@ -603,7 +603,8 @@ start exactly where you are now.
- 
- 
- ----------
--Thanks to Paolo Ciarrocchi who allowed the "Development Process" section
-+Thanks to Paolo Ciarrocchi who allowed the "Development Process"
-+(http://linux.tar.bz/articles/2.6-development_process) section
- to be based on text he had written, and to Randy Dunlap and Gerrit
- Huizenga for some of the list of things you should and should not say.
- Also thanks to Pat Mochel, Hanna Linder, Randy Dunlap, Kay Sievers,
diff --git a/driver/fix-ocfs2-warning-when-debug_fs-is-not-enabled.patch b/driver/fix-ocfs2-warning-when-debug_fs-is-not-enabled.patch
deleted file mode 100644
index 7a304985decf2..0000000000000
--- a/driver/fix-ocfs2-warning-when-debug_fs-is-not-enabled.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From akpm@osdl.org Tue Apr 18 21:31:11 2006
-Message-Id: <200604190431.k3J4V3Bb008744@shell0.pdx.osdl.net>
-Subject: Fix OCFS2 warning when DEBUG_FS is not enabled
-To: greg@kroah.com
-Cc: akpm@osdl.org, khali@linux-fr.org, arjan@infradead.org,
-   Joel.Becker@oracle.com, mark.fasheh@oracle.com
-From: akpm@osdl.org
-Date: Tue, 18 Apr 2006 21:30:22 -0700
-
-
-From: Jean Delvare <khali@linux-fr.org>
-
-Fix the following warning which happens when OCFS2_FS is enabled but
-DEBUG_FS isn't:
-
-fs/ocfs2/dlmglue.c: In function `ocfs2_dlm_init_debug':
-fs/ocfs2/dlmglue.c:2036: warning: passing arg 5 of `debugfs_create_file' discards qualifiers from pointer target type
-
-Signed-off-by: Jean Delvare <khali@linux-fr.org>
-Cc: Arjan van de Ven <arjan@infradead.org>
-Cc: Joel Becker <Joel.Becker@oracle.com>
-Acked-by: Mark Fasheh <mark.fasheh@oracle.com>
-Signed-off-by: Andrew Morton <akpm@osdl.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
----
-
----
- include/linux/debugfs.h |    5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
---- gregkh-2.6.orig/include/linux/debugfs.h
-+++ gregkh-2.6/include/linux/debugfs.h
-@@ -58,9 +58,8 @@ struct dentry *debugfs_create_blob(const
-  */
- 
- static inline struct dentry *debugfs_create_file(const char *name, mode_t mode,
--						 struct dentry *parent,
--						 void *data,
--						 struct file_operations *fops)
-+					struct dentry *parent, void *data,
-+					const struct file_operations *fops)
- {
- 	return ERR_PTR(-ENODEV);
- }
diff --git a/driver/frame-buffer-remove-cmap-sysfs-interface.patch b/driver/frame-buffer-remove-cmap-sysfs-interface.patch
deleted file mode 100644
index 1df44994d6b8d..0000000000000
--- a/driver/frame-buffer-remove-cmap-sysfs-interface.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-From jonsmirl@gmail.com Wed Apr 12 16:43:38 2006
-Message-ID: <9e4733910604121643u3cf7449dubac79e0869fe8712@mail.gmail.com>
-Date: Wed, 12 Apr 2006 19:43:35 -0400
-From: "Jon Smirl" <jonsmirl@gmail.com>
-To: "Greg KH" <gregkh@suse.de>
-Subject: Frame buffer: remove cmap sysfs interface
-
-Remove it as it does not work properly due to sysfs core changes.
-
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/video/fbsysfs.c |   92 +-----------------------------------------------
- 1 file changed, 3 insertions(+), 89 deletions(-)
-
---- gregkh-2.6.orig/drivers/video/fbsysfs.c
-+++ gregkh-2.6/drivers/video/fbsysfs.c
-@@ -305,94 +305,6 @@ static ssize_t show_stride(struct class_
- 	return snprintf(buf, PAGE_SIZE, "%d\n", fb_info->fix.line_length);
- }
- 
--/* Format for cmap is "%02x%c%4x%4x%4x\n" */
--/* %02x entry %c transp %4x red %4x blue %4x green \n */
--/* 256 rows at 16 chars equals 4096, the normal page size */
--/* the code will automatically adjust for different page sizes */
--static ssize_t store_cmap(struct class_device *class_device, const char *buf,
--			  size_t count)
--{
--	struct fb_info *fb_info = class_get_devdata(class_device);
--	int rc, i, start, length, transp = 0;
--
--	if ((count > PAGE_SIZE) || ((count % 16) != 0))
--		return -EINVAL;
--
--	if (!fb_info->fbops->fb_setcolreg && !fb_info->fbops->fb_setcmap)
--		return -EINVAL;
--
--	sscanf(buf, "%02x", &start);
--	length = count / 16;
--
--	for (i = 0; i < length; i++)
--		if (buf[i * 16 + 2] != ' ')
--			transp = 1;
--
--	/* If we can batch, do it */
--	if (fb_info->fbops->fb_setcmap && length > 1) {
--		struct fb_cmap umap;
--
--		memset(&umap, 0, sizeof(umap));
--		if ((rc = fb_alloc_cmap(&umap, length, transp)))
--			return rc;
--
--		umap.start = start;
--		for (i = 0; i < length; i++) {
--			sscanf(&buf[i * 16 +  3], "%4hx", &umap.red[i]);
--			sscanf(&buf[i * 16 +  7], "%4hx", &umap.blue[i]);
--			sscanf(&buf[i * 16 + 11], "%4hx", &umap.green[i]);
--			if (transp)
--				umap.transp[i] = (buf[i * 16 +  2] != ' ');
--		}
--		rc = fb_info->fbops->fb_setcmap(&umap, fb_info);
--		fb_copy_cmap(&umap, &fb_info->cmap);
--		fb_dealloc_cmap(&umap);
--
--		return rc ?: count;
--	}
--	for (i = 0; i < length; i++) {
--		u16 red, blue, green, tsp;
--
--		sscanf(&buf[i * 16 +  3], "%4hx", &red);
--		sscanf(&buf[i * 16 +  7], "%4hx", &blue);
--		sscanf(&buf[i * 16 + 11], "%4hx", &green);
--		tsp = (buf[i * 16 +  2] != ' ');
--		if ((rc = fb_info->fbops->fb_setcolreg(start++,
--				      red, green, blue, tsp, fb_info)))
--			return rc;
--
--		fb_info->cmap.red[i] = red;
--		fb_info->cmap.blue[i] = blue;
--		fb_info->cmap.green[i] = green;
--		if (transp)
--			fb_info->cmap.transp[i] = tsp;
--	}
--	return count;
--}
--
--static ssize_t show_cmap(struct class_device *class_device, char *buf)
--{
--	struct fb_info *fb_info = class_get_devdata(class_device);
--	unsigned int i;
--
--	if (!fb_info->cmap.red || !fb_info->cmap.blue ||
--	   !fb_info->cmap.green)
--		return -EINVAL;
--
--	if (fb_info->cmap.len > PAGE_SIZE / 16)
--		return -EINVAL;
--
--	/* don't mess with the format, the buffer is PAGE_SIZE */
--	/* 256 entries at 16 chars per line equals 4096 = PAGE_SIZE */
--	for (i = 0; i < fb_info->cmap.len; i++) {
--		snprintf(&buf[ i * 16], PAGE_SIZE - i * 16, "%02x%c%4x%4x%4x\n", i + fb_info->cmap.start,
--			((fb_info->cmap.transp && fb_info->cmap.transp[i]) ? '*' : ' '),
--			fb_info->cmap.red[i], fb_info->cmap.blue[i],
--			fb_info->cmap.green[i]);
--	}
--	return 16 * fb_info->cmap.len;
--}
--
- static ssize_t store_blank(struct class_device *class_device, const char * buf,
- 			   size_t count)
- {
-@@ -502,10 +414,12 @@ static ssize_t show_fbstate(struct class
- 	return snprintf(buf, PAGE_SIZE, "%d\n", fb_info->state);
- }
- 
-+/* When cmap is added back in it should be a binary attribute
-+ * not a text one. Consideration should also be given to converting
-+ * fbdev to use configfs instead of sysfs */
- static struct class_device_attribute class_device_attrs[] = {
- 	__ATTR(bits_per_pixel, S_IRUGO|S_IWUSR, show_bpp, store_bpp),
- 	__ATTR(blank, S_IRUGO|S_IWUSR, show_blank, store_blank),
--	__ATTR(color_map, S_IRUGO|S_IWUSR, show_cmap, store_cmap),
- 	__ATTR(console, S_IRUGO|S_IWUSR, show_console, store_console),
- 	__ATTR(cursor, S_IRUGO|S_IWUSR, show_cursor, store_cursor),
- 	__ATTR(mode, S_IRUGO|S_IWUSR, show_mode, store_mode),
diff --git a/driver/kobject-fix-build-error.patch b/driver/kobject-fix-build-error.patch
deleted file mode 100644
index 3ad0ebd4536d1..0000000000000
--- a/driver/kobject-fix-build-error.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From foo@baz Tue Apr  9 12:12:43 2002
-Date: Tue, 25 Apr 2006 15:37:26 +0200
-From: Kay Sievers <kay.sievers@vrfy.org>
-To: Greg KH <greg@kroah.com>
-Subject: Kobject: fix build error
-
-This fixes a build error for various odd combinations of CONFIG_HOTPLUG
-and CONFIG_NET.
-
-Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
-Cc: Nigel Cunningham <ncunningham@cyclades.com>
-Cc: Andrew Morton <akpm@osdl.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
-
----
- include/linux/kobject.h |    2 +-
- lib/kobject_uevent.c    |    8 +++++++-
- 2 files changed, 8 insertions(+), 2 deletions(-)
-
---- gregkh-2.6.orig/include/linux/kobject.h
-+++ gregkh-2.6/include/linux/kobject.h
-@@ -259,7 +259,7 @@ struct subsys_attribute {
- extern int subsys_create_file(struct subsystem * , struct subsys_attribute *);
- extern void subsys_remove_file(struct subsystem * , struct subsys_attribute *);
- 
--#if defined(CONFIG_HOTPLUG) && defined(CONFIG_NET)
-+#if defined(CONFIG_HOTPLUG)
- void kobject_uevent(struct kobject *kobj, enum kobject_action action);
- 
- int add_uevent_var(char **envp, int num_envp, int *cur_index,
---- gregkh-2.6.orig/lib/kobject_uevent.c
-+++ gregkh-2.6/lib/kobject_uevent.c
-@@ -25,11 +25,13 @@
- #define BUFFER_SIZE	2048	/* buffer for the variables */
- #define NUM_ENVP	32	/* number of env pointers */
- 
--#if defined(CONFIG_HOTPLUG) && defined(CONFIG_NET)
-+#if defined(CONFIG_HOTPLUG)
- u64 uevent_seqnum;
- char uevent_helper[UEVENT_HELPER_PATH_LEN] = "/sbin/hotplug";
- static DEFINE_SPINLOCK(sequence_lock);
-+#if defined(CONFIG_NET)
- static struct sock *uevent_sock;
-+#endif
- 
- static char *action_to_string(enum kobject_action action)
- {
-@@ -155,6 +157,7 @@ void kobject_uevent(struct kobject *kobj
- 	spin_unlock(&sequence_lock);
- 	sprintf(seq_buff, "SEQNUM=%llu", (unsigned long long)seq);
- 
-+#if defined(CONFIG_NET)
- 	/* send netlink message */
- 	if (uevent_sock) {
- 		struct sk_buff *skb;
-@@ -179,6 +182,7 @@ void kobject_uevent(struct kobject *kobj
- 			netlink_broadcast(uevent_sock, skb, 0, 1, GFP_KERNEL);
- 		}
- 	}
-+#endif
- 
- 	/* call uevent_helper, usually only enabled during early boot */
- 	if (uevent_helper[0]) {
-@@ -249,6 +253,7 @@ int add_uevent_var(char **envp, int num_
- }
- EXPORT_SYMBOL_GPL(add_uevent_var);
- 
-+#if defined(CONFIG_NET)
- static int __init kobject_uevent_init(void)
- {
- 	uevent_sock = netlink_kernel_create(NETLINK_KOBJECT_UEVENT, 1, NULL,
-@@ -264,5 +269,6 @@ static int __init kobject_uevent_init(vo
- }
- 
- postcore_initcall(kobject_uevent_init);
-+#endif
- 
- #endif /* CONFIG_HOTPLUG */
diff --git a/driver/kobject-possible-cleanups.patch b/driver/kobject-possible-cleanups.patch
deleted file mode 100644
index 42e254a2e29a7..0000000000000
--- a/driver/kobject-possible-cleanups.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From bunk@stusta.de Sat Apr 22 03:15:16 2006
-Date: Sat, 22 Apr 2006 12:14:44 +0200
-From: Adrian Bunk <bunk@stusta.de>
-To: gregkh@suse.de
-Subject: Kobject: possible cleanups
-Message-ID: <20060422101444.GN19754@stusta.de>
-Content-Disposition: inline
-
-This patch contains the following possible cleanups:
-- #if 0 the following unused global function:
-  - subsys_remove_file()
-- remove the following unused EXPORT_SYMBOL's:
-  - kset_find_obj
-  - subsystem_init
-- remove the following unused EXPORT_SYMBOL_GPL:
-  - kobject_add_dir
-
-Signed-off-by: Adrian Bunk <bunk@stusta.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
-
----
- include/linux/kobject.h |    1 -
- lib/kobject.c           |    7 ++-----
- 2 files changed, 2 insertions(+), 6 deletions(-)
-
---- gregkh-2.6.orig/include/linux/kobject.h
-+++ gregkh-2.6/include/linux/kobject.h
-@@ -257,7 +257,6 @@ struct subsys_attribute {
- };
- 
- extern int subsys_create_file(struct subsystem * , struct subsys_attribute *);
--extern void subsys_remove_file(struct subsystem * , struct subsys_attribute *);
- 
- #if defined(CONFIG_HOTPLUG)
- void kobject_uevent(struct kobject *kobj, enum kobject_action action);
---- gregkh-2.6.orig/lib/kobject.c
-+++ gregkh-2.6/lib/kobject.c
-@@ -429,7 +429,6 @@ struct kobject *kobject_add_dir(struct k
- 
- 	return k;
- }
--EXPORT_SYMBOL_GPL(kobject_add_dir);
- 
- /**
-  *	kset_init - initialize a kset for use
-@@ -576,7 +575,7 @@ int subsys_create_file(struct subsystem 
-  *	@s:	subsystem.
-  *	@a:	attribute desciptor.
-  */
--
-+#if 0
- void subsys_remove_file(struct subsystem * s, struct subsys_attribute * a)
- {
- 	if (subsys_get(s)) {
-@@ -584,6 +583,7 @@ void subsys_remove_file(struct subsystem
- 		subsys_put(s);
- 	}
- }
-+#endif  /*  0  */
- 
- EXPORT_SYMBOL(kobject_init);
- EXPORT_SYMBOL(kobject_register);
-@@ -595,10 +595,7 @@ EXPORT_SYMBOL(kobject_del);
- 
- EXPORT_SYMBOL(kset_register);
- EXPORT_SYMBOL(kset_unregister);
--EXPORT_SYMBOL(kset_find_obj);
- 
--EXPORT_SYMBOL(subsystem_init);
- EXPORT_SYMBOL(subsystem_register);
- EXPORT_SYMBOL(subsystem_unregister);
- EXPORT_SYMBOL(subsys_create_file);
--EXPORT_SYMBOL(subsys_remove_file);