diff options
| author | <greg@echidna.(none)> | 2005-09-28 14:32:18 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-09-28 14:32:18 -0700 |
| commit | 6df489973b004b8e9743424c49b26c129867d9b0 (patch) | |
| tree | 8da6aa162e88315d19db69bb4c1d12db828891ab /gregkh | |
| parent | 6b125dfc27e60be5ac070a9f1519f47f60b30ae8 (diff) | |
| download | patches-6df489973b004b8e9743424c49b26c129867d9b0.tar.gz | |
reorder and refresh and fix merge issues
Diffstat (limited to 'gregkh')
| -rw-r--r-- | gregkh/gregkh-usb-hacking.patch | 39 |
1 files changed, 28 insertions, 11 deletions
diff --git a/gregkh/gregkh-usb-hacking.patch b/gregkh/gregkh-usb-hacking.patch index c338da76de7e0..9f0a19565b272 100644 --- a/gregkh/gregkh-usb-hacking.patch +++ b/gregkh/gregkh-usb-hacking.patch @@ -4,14 +4,13 @@ Don't mess with it, it's horrible. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> ---- drivers/usb/Makefile | 2 - drivers/usb/gregkh.c | 289 +++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 291 insertions(+) + drivers/usb/gregkh.c | 307 +++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 309 insertions(+) --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gregkh-2.6/drivers/usb/gregkh.c 2005-07-13 09:49:41.000000000 -0700 -@@ -0,0 +1,289 @@ ++++ gregkh-2.6/drivers/usb/gregkh.c 2005-09-28 13:56:01.000000000 -0700 +@@ -0,0 +1,307 @@ +/* + * greg kroah-hartman's junk module + * @@ -222,17 +221,35 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +static struct class *greg_class; + ++ ++ssize_t cd_show(struct class_device *cd, char *buf) ++{ ++ return sprintf(buf, "this is device %s\n", kobject_name(&cd->kobj)); ++} ++static CLASS_DEVICE_ATTR(name, 0444, cd_show, NULL); ++ ++ ++ +static void greg_class_init(void) +{ ++ struct class_device *g2; ++ struct class_device *cd; ++ + greg_class = class_create(THIS_MODULE, "gregkh"); + -+ class_device_create(greg_class, MKDEV(42, 0), NULL, "greg1"); -+ class_device_create(greg_class, MKDEV(42, 1), NULL, "greg2"); -+ class_device_create(greg_class, MKDEV(42, 2), NULL, "greg3"); ++ class_device_create(greg_class, NULL, MKDEV(42, 0), NULL, "greg1"); ++ g2 = class_device_create(greg_class, NULL, MKDEV(42, 1), NULL, "greg2"); ++ class_device_create(greg_class, NULL, MKDEV(42, 2), NULL, "greg3"); + + printk("GREG: create a dupe name\n"); -+ class_device_create(greg_class, MKDEV(42, 3), NULL, "greg1"); ++ class_device_create(greg_class, NULL, MKDEV(42, 3), NULL, "greg1"); + printk("GREG: dup name created\n"); ++ ++ class_device_create(greg_class, g2, MKDEV(42,4), NULL, "greg2.4"); ++ class_device_create(greg_class, g2, 0, NULL, "greg2.%s", "null"); ++ cd = class_device_create(greg_class, g2, MKDEV(42,5), NULL, "greg%d.%d", 2, 5); ++ class_device_create_file(cd, &class_device_attr_name); ++ +} + + @@ -301,8 +318,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> +module_init(greg_init); +module_exit(greg_exit); +MODULE_LICENSE("GPL"); ---- gregkh-2.6.orig/drivers/usb/Makefile 2005-07-13 09:45:06.000000000 -0700 -+++ gregkh-2.6/drivers/usb/Makefile 2005-07-13 09:49:41.000000000 -0700 +--- gregkh-2.6.orig/drivers/usb/Makefile 2005-09-28 13:49:06.000000000 -0700 ++++ gregkh-2.6/drivers/usb/Makefile 2005-09-28 13:55:44.000000000 -0700 @@ -76,3 +76,5 @@ obj-$(CONFIG_USB_ATM) += atm/ |