diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2009-02-03 16:13:46 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-02-03 16:13:46 -0800 |
| commit | 62db7ee89292d2f952b6872ac3d5d946b25b6f9c (patch) | |
| tree | 18286af07a5b32489a07c10a21d3e2cba800c3de | |
| parent | 94f61e3d1a2b191b34a98a179285a98542ad24a0 (diff) | |
| download | patches-62db7ee89292d2f952b6872ac3d5d946b25b6f9c.tar.gz | |
2.6.29-rc3-git5
| -rw-r--r-- | driver-core/bus_id-ide.patch | 22 | ||||
| -rw-r--r-- | series | 7 | ||||
| -rw-r--r-- | staging/staging-aten2011-fix-up-c-comments.patch (renamed from f1.patch) | 11 | ||||
| -rw-r--r-- | staging/staging-aten2011-remove-dprintk-macro.patch (renamed from f2.patch) | 12 | ||||
| -rw-r--r-- | version | 2 |
5 files changed, 27 insertions, 27 deletions
diff --git a/driver-core/bus_id-ide.patch b/driver-core/bus_id-ide.patch deleted file mode 100644 index 99431b06e678e8..00000000000000 --- a/driver-core/bus_id-ide.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: Kay Sievers <kay.sievers@vrfy.org> -Subject: ide: struct device - replace bus_id with dev_name(), dev_set_name() - -Cc: bzolnier@gmail.com -Cc: linux-ide@vger.kernel.org -Acked-by: Greg Kroah-Hartman <gregkh@suse.de> -Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> ---- - drivers/ide/ide-acpi.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/ide/ide-acpi.c -+++ b/drivers/ide/ide-acpi.c -@@ -282,7 +282,7 @@ static int do_drive_get_GTF(ide_drive_t - port = hwif->channel ? drive->dn - 2: drive->dn; - - DEBPRINT("ENTER: %s at %s, port#: %d, hard_port#: %d\n", -- hwif->name, dev->bus_id, port, hwif->channel); -+ hwif->name, dev_name(dev), port, hwif->channel); - - if ((drive->dev_flags & IDE_DFLAG_PRESENT) == 0) { - DEBPRINT("%s drive %d:%d not present\n", @@ -55,7 +55,6 @@ driver-core/bus_id-dio.patch driver-core/bus_id-dma.patch driver-core/bus_id-eisa.patch driver-core/bus_id-gpio.patch -driver-core/bus_id-ide.patch driver-core/bus_id-mca.patch driver-core/bus_id-mfd.patch driver-core/bus_id-wimax.patch @@ -69,7 +68,7 @@ driver-core/driver-core-check-bus-match-without-holding-device-lock.patch driver-core/uio-add-name-attributes-for-mappings-and-port-regions.patch driver-core/uio-add-the-uio_aec-driver.patch -driver-core/parisc-don-t-touch-driver-core-internals.patch +#driver-core/parisc-don-t-touch-driver-core-internals.patch driver-core/driver-core-create-a-private-portion-of-struct-device.patch driver-core/driver-core-move-klist_children-into-private-structure.patch driver-core/driver-core-move-knode_driver-into-private-structure.patch @@ -243,10 +242,10 @@ staging/staging-aten2011-fix-up-the-set_uart_reg-function.patch staging/staging-aten2011-fix-up-the-get_uart_reg-function.patch staging/staging-aten2011-delete-the-dump_serial_port-function.patch staging/staging-aten2011-remove-wrappers-around-serial-get-and-put-data-functions.patch +staging/staging-aten2011-fix-up-c-comments.patch +staging/staging-aten2011-remove-dprintk-macro.patch staging/staging-add-b3dfg-driver.patch staging/staging-b3dfg-fixups-and-improvements.patch staging/staging-b3dfg-prepare-b3dfg-for-submission-upstream.patch -f1.patch -f2.patch diff --git a/f1.patch b/staging/staging-aten2011-fix-up-c-comments.patch index 1c5c308eaf3fb4..5b3d73fc4ef1bd 100644 --- a/f1.patch +++ b/staging/staging-aten2011-fix-up-c-comments.patch @@ -1,3 +1,14 @@ +From foo@baz Tue Feb 3 16:06:19 PST 2009 +Date: Tue, 03 Feb 2009 16:06:19 -0800 +To: Greg KH <greg@kroah.com> +From: Greg Kroah-Hartman <gregkh@suse.de> +Subject: Staging: aten2011: fix up c++ comments + +Convert all C++ comments to /* */ + +Cc: Russell Lang <gsview@ghostgum.com.au> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + --- drivers/staging/uc2322/aten2011.c | 241 +++++++++++++++----------------------- 1 file changed, 99 insertions(+), 142 deletions(-) diff --git a/f2.patch b/staging/staging-aten2011-remove-dprintk-macro.patch index 01a8cb5ed57133..6ff9e283622325 100644 --- a/f2.patch +++ b/staging/staging-aten2011-remove-dprintk-macro.patch @@ -1,3 +1,15 @@ +From foo@baz Tue Feb 3 16:06:19 PST 2009 +Date: Tue, 03 Feb 2009 16:06:19 -0800 +To: Greg KH <greg@kroah.com> +From: Greg Kroah-Hartman <gregkh@suse.de> +Subject: Staging: aten2011: remove DPRINTK macro + +Convert to use the dbg() macro we already have in the usb-serial layer. +This also turns off the default for the driver to spit out all of the +debug messages, now it is controlled by the module parameter. + +Cc: Russell Lang <gsview@ghostgum.com.au> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- drivers/staging/uc2322/aten2011.c | 313 ++++++++++++++------------------------ 1 file changed, 123 insertions(+), 190 deletions(-) @@ -1 +1 @@ -2.6.29-rc3-git2 +2.6.29-rc3-git5 |