diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-13 09:17:19 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-13 09:17:19 -0800 |
| commit | f08129a3698a4d5c6ef35cd88d8304eda01f8fd3 (patch) | |
| tree | 5790f8e68c60fcda6618a9815b649becd18222e1 /driver | |
| parent | accf026e092e5dbb915fd127ba91ef0735fc1046 (diff) | |
| download | patches-f08129a3698a4d5c6ef35cd88d8304eda01f8fd3.tar.gz | |
2.6.15-git9 refresh
Diffstat (limited to 'driver')
| -rw-r--r-- | driver/add-ecard_bus_type-probe-remove-shutdown-methods.patch | 6 | ||||
| -rw-r--r-- | driver/add-pcmcia_bus_type-probe-and-remove-methods.patch | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/driver/add-ecard_bus_type-probe-remove-shutdown-methods.patch b/driver/add-ecard_bus_type-probe-remove-shutdown-methods.patch index 6592b8c8ed062..a47da3be0956e 100644 --- a/driver/add-ecard_bus_type-probe-remove-shutdown-methods.patch +++ b/driver/add-ecard_bus_type-probe-remove-shutdown-methods.patch @@ -14,7 +14,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/arch/arm/kernel/ecard.c +++ gregkh-2.6/arch/arm/kernel/ecard.c -@@ -1146,9 +1146,11 @@ static void ecard_drv_shutdown(struct de +@@ -1147,9 +1147,11 @@ static void ecard_drv_shutdown(struct de struct ecard_driver *drv = ECARD_DRV(dev->driver); struct ecard_request req; @@ -29,7 +29,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* * If this card has a loader, call the reset handler. -@@ -1163,9 +1165,6 @@ static void ecard_drv_shutdown(struct de +@@ -1164,9 +1166,6 @@ static void ecard_drv_shutdown(struct de int ecard_register_driver(struct ecard_driver *drv) { drv->drv.bus = &ecard_bus_type; @@ -39,7 +39,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return driver_register(&drv->drv); } -@@ -1194,6 +1193,9 @@ struct bus_type ecard_bus_type = { +@@ -1195,6 +1194,9 @@ struct bus_type ecard_bus_type = { .name = "ecard", .dev_attrs = ecard_dev_attrs, .match = ecard_match, diff --git a/driver/add-pcmcia_bus_type-probe-and-remove-methods.patch b/driver/add-pcmcia_bus_type-probe-and-remove-methods.patch index 3b624fe8e514e..946ba675edff7 100644 --- a/driver/add-pcmcia_bus_type-probe-and-remove-methods.patch +++ b/driver/add-pcmcia_bus_type-probe-and-remove-methods.patch @@ -23,7 +23,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return driver_register(&driver->drv); } -@@ -1167,6 +1165,8 @@ struct bus_type pcmcia_bus_type = { +@@ -1200,6 +1198,8 @@ struct bus_type pcmcia_bus_type = { .uevent = pcmcia_bus_uevent, .match = pcmcia_bus_match, .dev_attrs = pcmcia_dev_attrs, |