diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-11 09:05:36 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-11 09:05:36 -0800 |
| commit | c4a28a4f7fe1269989bb7e46f14231ef67316bb3 (patch) | |
| tree | 26077cad438d73ac50dbf12f9727716e183f5ee4 /driver | |
| parent | 91a2cf51903acbc90f5b4d2453ddcafa09f8d20a (diff) | |
| download | patches-c4a28a4f7fe1269989bb7e46f14231ef67316bb3.tar.gz | |
2.6.15-git7 refresh
Diffstat (limited to 'driver')
| -rw-r--r-- | driver/add-ide_bus_type-probe-and-remove-methods.patch | 10 | ||||
| -rw-r--r-- | driver/add-parisc_bus_type-probe-and-remove-methods.patch | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/driver/add-ide_bus_type-probe-and-remove-methods.patch b/driver/add-ide_bus_type-probe-and-remove-methods.patch index 793ee8be3d28b..c5b2ec674b067 100644 --- a/driver/add-ide_bus_type-probe-and-remove-methods.patch +++ b/driver/add-ide_bus_type-probe-and-remove-methods.patch @@ -20,7 +20,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/drivers/ide/ide-cd.c +++ gregkh-2.6/drivers/ide/ide-cd.c -@@ -3254,9 +3254,8 @@ sector_t ide_cdrom_capacity (ide_drive_t +@@ -3256,9 +3256,8 @@ sector_t ide_cdrom_capacity (ide_drive_t } #endif @@ -31,7 +31,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> struct cdrom_info *info = drive->driver_data; ide_unregister_subdriver(drive, info->driver); -@@ -3264,8 +3263,6 @@ static int ide_cd_remove(struct device * +@@ -3266,8 +3265,6 @@ static int ide_cd_remove(struct device * del_gendisk(info->disk); ide_cd_put(info); @@ -40,7 +40,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } static void ide_cd_release(struct kref *kref) -@@ -3289,7 +3286,7 @@ static void ide_cd_release(struct kref * +@@ -3291,7 +3288,7 @@ static void ide_cd_release(struct kref * kfree(info); } @@ -49,7 +49,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #ifdef CONFIG_PROC_FS static int proc_idecd_read_capacity -@@ -3315,9 +3312,9 @@ static ide_driver_t ide_cdrom_driver = { +@@ -3317,9 +3314,9 @@ static ide_driver_t ide_cdrom_driver = { .owner = THIS_MODULE, .name = "ide-cdrom", .bus = &ide_bus_type, @@ -61,7 +61,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> .version = IDECD_VERSION, .media = ide_cdrom, .supports_dsc_overlap = 1, -@@ -3411,9 +3408,8 @@ static char *ignore = NULL; +@@ -3413,9 +3410,8 @@ static char *ignore = NULL; module_param(ignore, charp, 0400); MODULE_DESCRIPTION("ATAPI CD-ROM Driver"); diff --git a/driver/add-parisc_bus_type-probe-and-remove-methods.patch b/driver/add-parisc_bus_type-probe-and-remove-methods.patch index 2e98e98b57d83..ea325da67991f 100644 --- a/driver/add-parisc_bus_type-probe-and-remove-methods.patch +++ b/driver/add-parisc_bus_type-probe-and-remove-methods.patch @@ -24,7 +24,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> driver->drv.name = driver->name; return driver_register(&driver->drv); -@@ -570,6 +568,8 @@ struct bus_type parisc_bus_type = { +@@ -575,6 +573,8 @@ struct bus_type parisc_bus_type = { .name = "parisc", .match = parisc_generic_match, .dev_attrs = parisc_device_attrs, |