aboutsummaryrefslogtreecommitdiffstats
diff options
authorGreg Kroah-Hartman <gregkh@suse.de>2007-06-12 09:01:24 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2007-06-12 09:01:24 -0700
commit2d152df08f8a1b26c4bee993a1cd7ba18b0ef49b (patch)
tree1b9e4af5d2d3f577cb51cbcf58f083bd90260ec0
parentb16ab0a68ad537c42c0d5fe1870aed29779b8c90 (diff)
downloadpatches-2d152df08f8a1b26c4bee993a1cd7ba18b0ef49b.tar.gz
version udpate
-rw-r--r--pci/pci-change-all-drivers-to-use-pci_device-revision.patch10
-rw-r--r--version2
2 files changed, 6 insertions, 6 deletions
diff --git a/pci/pci-change-all-drivers-to-use-pci_device-revision.patch b/pci/pci-change-all-drivers-to-use-pci_device-revision.patch
index 159b0eb5991299..5500424427197a 100644
--- a/pci/pci-change-all-drivers-to-use-pci_device-revision.patch
+++ b/pci/pci-change-all-drivers-to-use-pci_device-revision.patch
@@ -882,7 +882,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- a/drivers/ide/pci/amd74xx.c
+++ b/drivers/ide/pci/amd74xx.c
-@@ -124,8 +124,7 @@ static int amd74xx_get_info(char *buffer
+@@ -126,8 +126,7 @@ static int amd74xx_get_info(char *buffer
amd_print("Driver Version: 2.13");
amd_print("South Bridge: %s", pci_name(bmide_dev));
@@ -892,7 +892,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
amd_print("Highest DMA rate: %s", amd_dma[amd_config->flags & AMD_UDMA]);
amd_print("BM-DMA base: %#lx", amd_base);
-@@ -325,8 +324,7 @@ static unsigned int __devinit init_chips
+@@ -327,8 +326,7 @@ static unsigned int __devinit init_chips
*/
if (amd_config->flags & AMD_CHECK_SWDMA) {
@@ -902,7 +902,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
amd_config->flags |= AMD_BAD_SWDMA;
}
-@@ -394,9 +392,8 @@ static unsigned int __devinit init_chips
+@@ -396,9 +394,8 @@ static unsigned int __devinit init_chips
* Print the boot message.
*/
@@ -1058,7 +1058,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
u8 btr = 0, mode;
pci_read_config_byte(dev, 0x5A, &btr);
mode = btr & 0x3;
-@@ -294,9 +290,6 @@ static unsigned int __devinit init_chips
+@@ -307,9 +303,6 @@ static unsigned int __devinit init_chips
unsigned int reg;
u8 btr;
@@ -1068,7 +1068,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
/* force Master Latency Timer value to 64 PCICLKs */
pci_write_config_byte(dev, PCI_LATENCY_TIMER, 0x40);
-@@ -375,7 +368,7 @@ static unsigned int __devinit init_chips
+@@ -388,7 +381,7 @@ static unsigned int __devinit init_chips
if (!(PCI_FUNC(dev->devfn) & 1))
btr |= 0x2;
else
diff --git a/version b/version
index d97f922279a442..e2a23646b10cba 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-2.6.22-rc4-git3
+2.6.22-rc4-git4