diff options
| -rw-r--r-- | devfs/devfs-remove-devfs_mk_bdev.patch | 4 | ||||
| -rw-r--r-- | devfs/devfs-remove-devfs_mk_dir.patch | 2 | ||||
| -rw-r--r-- | devfs/devfs-remove-devfs_remove.patch | 2 | ||||
| -rw-r--r-- | pci/pci-legacy-i-o-port-free-driver-make-intel-e1000-driver-legacy-i-o-port-free.patch | 8 | ||||
| -rw-r--r-- | version | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/devfs/devfs-remove-devfs_mk_bdev.patch b/devfs/devfs-remove-devfs_mk_bdev.patch index 010bb05ef937ea..7dc9f1a6df889b 100644 --- a/devfs/devfs-remove-devfs_mk_bdev.patch +++ b/devfs/devfs-remove-devfs_mk_bdev.patch @@ -97,7 +97,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> */ --- gregkh-2.6.orig/drivers/md/md.c +++ gregkh-2.6/drivers/md/md.c -@@ -5060,8 +5060,6 @@ static void md_geninit(void) +@@ -5062,8 +5062,6 @@ static void md_geninit(void) static int __init md_init(void) { @@ -106,7 +106,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> printk(KERN_INFO "md: md driver %d.%d.%d MAX_MD_DEVS=%d," " MD_SB_DISKS=%d\n", MD_MAJOR_VERSION, MD_MINOR_VERSION, -@@ -5080,17 +5078,6 @@ static int __init md_init(void) +@@ -5082,17 +5080,6 @@ static int __init md_init(void) blk_register_region(MKDEV(mdp_major, 0), MAX_MD_DEVS<<MdpMinorShift, THIS_MODULE, md_probe, NULL, NULL); diff --git a/devfs/devfs-remove-devfs_mk_dir.patch b/devfs/devfs-remove-devfs_mk_dir.patch index 5516c508715df2..37cdc55592b009 100644 --- a/devfs/devfs-remove-devfs_mk_dir.patch +++ b/devfs/devfs-remove-devfs_mk_dir.patch @@ -263,7 +263,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/drivers/md/md.c +++ gregkh-2.6/drivers/md/md.c -@@ -5075,7 +5075,6 @@ static int __init md_init(void) +@@ -5077,7 +5077,6 @@ static int __init md_init(void) unregister_blkdev(MAJOR_NR, "md"); return -1; } diff --git a/devfs/devfs-remove-devfs_remove.patch b/devfs/devfs-remove-devfs_remove.patch index 98b052ba4e52ee..5fdc880e1c85d3 100644 --- a/devfs/devfs-remove-devfs_remove.patch +++ b/devfs/devfs-remove-devfs_remove.patch @@ -614,7 +614,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> hc->name = new_name; --- gregkh-2.6.orig/drivers/md/md.c +++ gregkh-2.6/drivers/md/md.c -@@ -5133,15 +5133,9 @@ static __exit void md_exit(void) +@@ -5135,15 +5135,9 @@ static __exit void md_exit(void) { mddev_t *mddev; struct list_head *tmp; diff --git a/pci/pci-legacy-i-o-port-free-driver-make-intel-e1000-driver-legacy-i-o-port-free.patch b/pci/pci-legacy-i-o-port-free-driver-make-intel-e1000-driver-legacy-i-o-port-free.patch index 71a26ba463a1a3..31df65f649b2d2 100644 --- a/pci/pci-legacy-i-o-port-free-driver-make-intel-e1000-driver-legacy-i-o-port-free.patch +++ b/pci/pci-legacy-i-o-port-free-driver-make-intel-e1000-driver-legacy-i-o-port-free.patch @@ -143,7 +143,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* required last entry */ {0,} }; -@@ -619,7 +619,14 @@ e1000_probe(struct pci_dev *pdev, +@@ -621,7 +621,14 @@ e1000_probe(struct pci_dev *pdev, int i, err, pci_using_dac; uint16_t eeprom_data; uint16_t eeprom_apme_mask = E1000_EEPROM_APME; @@ -159,7 +159,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return err; if (!(err = pci_set_dma_mask(pdev, DMA_64BIT_MASK))) { -@@ -652,6 +659,7 @@ e1000_probe(struct pci_dev *pdev, +@@ -654,6 +661,7 @@ e1000_probe(struct pci_dev *pdev, adapter->pdev = pdev; adapter->hw.back = adapter; adapter->msg_enable = (1 << debug) - 1; @@ -167,7 +167,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> mmio_start = pci_resource_start(pdev, BAR_0); mmio_len = pci_resource_len(pdev, BAR_0); -@@ -662,12 +670,15 @@ e1000_probe(struct pci_dev *pdev, +@@ -664,12 +672,15 @@ e1000_probe(struct pci_dev *pdev, goto err_ioremap; } @@ -189,7 +189,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } } -@@ -4575,7 +4586,7 @@ e1000_resume(struct pci_dev *pdev) +@@ -4577,7 +4588,7 @@ e1000_resume(struct pci_dev *pdev) if (retval) DPRINTK(PROBE, ERR, "Error in setting power state\n"); e1000_pci_restore_state(adapter); @@ -1 +1 @@ -2.6.17-rc5 +2.6.17-rc5-git5 |