diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-10-31 12:39:39 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-10-31 12:39:39 -0800 |
| commit | 430b23f3edda166ee8c35defb1056063a47b0c89 (patch) | |
| tree | 6bf1595dba2c5c14686b3afd1994953c721b95c8 | |
| parent | 215caaf87603e8de8f718057dbe051d66f5716d4 (diff) | |
| download | patches-430b23f3edda166ee8c35defb1056063a47b0c89.tar.gz | |
version sync
| -rw-r--r-- | driver-class/block-device.patch | 4 | ||||
| -rw-r--r-- | driver-class/pcmcia-device.patch | 2 | ||||
| -rw-r--r-- | driver/uio.patch | 2 | ||||
| -rw-r--r-- | version | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/driver-class/block-device.patch b/driver-class/block-device.patch index 399feb3dc2bad2..916ec94410043e 100644 --- a/driver-class/block-device.patch +++ b/driver-class/block-device.patch @@ -827,7 +827,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } static struct kobject *bdev_get_holder(struct block_device *bdev) -@@ -924,7 +924,7 @@ static int __blkdev_put(struct block_dev +@@ -944,7 +944,7 @@ static int __blkdev_put(struct block_dev module_put(owner); if (bdev->bd_contains != bdev) { @@ -836,7 +836,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> bdev->bd_part = NULL; } bdev->bd_disk = NULL; -@@ -1015,7 +1015,7 @@ do_open(struct block_device *bdev, struc +@@ -1035,7 +1035,7 @@ do_open(struct block_device *bdev, struc ret = -ENXIO; goto out_first; } diff --git a/driver-class/pcmcia-device.patch b/driver-class/pcmcia-device.patch index 56a8dd689283d2..ee216fb388ffac 100644 --- a/driver-class/pcmcia-device.patch +++ b/driver-class/pcmcia-device.patch @@ -160,7 +160,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/drivers/pcmcia/i82092.c +++ gregkh-2.6/drivers/pcmcia/i82092.c -@@ -157,7 +157,7 @@ static int __devinit i82092aa_pci_probe( +@@ -161,7 +161,7 @@ static int __devinit i82092aa_pci_probe( pci_set_drvdata(dev, &sockets[i].socket); for (i = 0; i<socket_count; i++) { diff --git a/driver/uio.patch b/driver/uio.patch index 971aabfb0fc752..1a0ceb9baf53f8 100644 --- a/driver/uio.patch +++ b/driver/uio.patch @@ -26,7 +26,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/Documentation/DocBook/kernel-api.tmpl +++ gregkh-2.6/Documentation/DocBook/kernel-api.tmpl -@@ -453,6 +453,11 @@ X!Edrivers/pnp/system.c +@@ -393,6 +393,11 @@ X!Edrivers/pnp/system.c !Edrivers/pnp/manager.c !Edrivers/pnp/support.c </sect1> @@ -1 +1 @@ -2.6.19-rc3-git6 +2.6.19-rc4 |