aboutsummaryrefslogtreecommitdiffstats
diff options
authorGreg Kroah-Hartman <gregkh@suse.de>2008-06-17 10:56:12 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2008-06-17 10:56:12 -0700
commitd7396f5211b8b8368a8ddfcece1bb75ad820a728 (patch)
treebb097ab9ba6f702858a12874a8affdb21d2176bc
parentdc2b6c18831a588b9d2a5e789866ccd2baea1f43 (diff)
downloadpatches-d7396f5211b8b8368a8ddfcece1bb75ad820a728.tar.gz
2.6.26-rc6-git4 resync
-rw-r--r--driver-core/pci-make-pci_name-use-dev_name.patch2
-rw-r--r--version2
2 files changed, 2 insertions, 2 deletions
diff --git a/driver-core/pci-make-pci_name-use-dev_name.patch b/driver-core/pci-make-pci_name-use-dev_name.patch
index 2bd1cb0b81f3ce..095c01788c1b29 100644
--- a/driver-core/pci-make-pci_name-use-dev_name.patch
+++ b/driver-core/pci-make-pci_name-use-dev_name.patch
@@ -28,7 +28,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
if (ofpci_verbose)
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
-@@ -976,9 +976,9 @@ static inline void pci_set_drvdata(struc
+@@ -977,9 +977,9 @@ static inline void pci_set_drvdata(struc
/* If you want to know what to call your pci_dev, ask this function.
* Again, it's a wrapper around the generic device.
*/
diff --git a/version b/version
index 15f772b664b1c0..e61d353e7e402d 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-2.6.26-rc6
+2.6.26-rc6-git4