diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2008-05-27 10:16:35 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-05-27 10:16:35 -0700 |
| commit | f26fb51c037e592729cb8b74010596a3bf66d1be (patch) | |
| tree | e186b05f7af7c0ba394e56a92818dc554048e5e6 | |
| parent | 8b4de0309db8adf21c948a93be656ab2cc75dc4c (diff) | |
| download | patches-f26fb51c037e592729cb8b74010596a3bf66d1be.tar.gz | |
2.6.26-rc4 resync
4 files changed, 5 insertions, 5 deletions
diff --git a/driver-core/device-create-char-convert-device_create-to-device_create_drvdata.patch b/driver-core/device-create-char-convert-device_create-to-device_create_drvdata.patch index 89e8006d77c3b3..1539d830457e52 100644 --- a/driver-core/device-create-char-convert-device_create-to-device_create_drvdata.patch +++ b/driver-core/device-create-char-convert-device_create-to-device_create_drvdata.patch @@ -46,7 +46,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> goto out; --- a/drivers/char/ip2/ip2main.c +++ b/drivers/char/ip2/ip2main.c -@@ -713,12 +713,12 @@ ip2_loadmain(int *iop, int *irqp, unsign +@@ -692,12 +692,12 @@ ip2_loadmain(int *iop, int *irqp, unsign } if ( NULL != ( pB = i2BoardPtrTable[i] ) ) { diff --git a/driver-core/driver-core-fix-a-lot-of-printk-usages-of-bus_id.patch b/driver-core/driver-core-fix-a-lot-of-printk-usages-of-bus_id.patch index 7d82001981000d..750f3668f93443 100644 --- a/driver-core/driver-core-fix-a-lot-of-printk-usages-of-bus_id.patch +++ b/driver-core/driver-core-fix-a-lot-of-printk-usages-of-bus_id.patch @@ -110,7 +110,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> ec->resource[i].flags = 0; --- a/arch/arm/mach-integrator/impd1.c +++ b/arch/arm/mach-integrator/impd1.c -@@ -406,8 +406,7 @@ static int impd1_probe(struct lm_device +@@ -407,8 +407,7 @@ static int impd1_probe(struct lm_device ret = amba_device_register(d, &dev->resource); if (ret) { diff --git a/driver-core/net-convert-the-phy_device-file-to-use-bus_find_device_by_name.patch b/driver-core/net-convert-the-phy_device-file-to-use-bus_find_device_by_name.patch index 9c3dc53f630f92..ff40ae0c295e19 100644 --- a/driver-core/net-convert-the-phy_device-file-to-use-bus_find_device_by_name.patch +++ b/driver-core/net-convert-the-phy_device-file-to-use-bus_find_device_by_name.patch @@ -22,7 +22,7 @@ drivers/net/phy/phy_device.c | 8 +------- --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c -@@ -308,11 +308,6 @@ void phy_disconnect(struct phy_device *p +@@ -309,11 +309,6 @@ void phy_disconnect(struct phy_device *p } EXPORT_SYMBOL(phy_disconnect); @@ -34,7 +34,7 @@ drivers/net/phy/phy_device.c | 8 +------- /** * phy_attach - attach a network device to a particular PHY device * @dev: network device to attach -@@ -336,8 +331,7 @@ struct phy_device *phy_attach(struct net +@@ -337,8 +332,7 @@ struct phy_device *phy_attach(struct net /* Search the list of PHY devices on the mdio bus for the * PHY with the requested name */ @@ -1 +1 @@ -2.6.26-rc3-git6 +2.6.26-rc4 |