diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-03 10:37:40 -0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-03 10:37:40 -0800 |
commit | 7c5bb7c46c50b7a008ed3401c1d018dcd192d288 (patch) | |
tree | 7eda4a6d1a2f90f324bcfda2310df6bba4c25b23 | |
parent | 373ecab16727fcb04e0d4684f5c65ce92f2e6ede (diff) | |
download | patches-7c5bb7c46c50b7a008ed3401c1d018dcd192d288.tar.gz |
2.6.15 refreshv2.6.15
-rw-r--r-- | devfs/devfs-remove-devfs_mk_cdev.patch | 4 | ||||
-rw-r--r-- | devfs/devfs-remove-devfs_mk_dir.patch | 2 | ||||
-rw-r--r-- | devfs/devfs-remove-devfs_remove.patch | 4 | ||||
-rw-r--r-- | devfs/devfs-remove-scsi-devfs_name.patch | 2 | ||||
-rw-r--r-- | pci/drivers-net-replace-pci_module_init-with-pci_register_driver.patch | 6 | ||||
-rw-r--r-- | pci/x86-pci-domain-support-struct-pci_sysdata.patch | 2 |
6 files changed, 10 insertions, 10 deletions
diff --git a/devfs/devfs-remove-devfs_mk_cdev.patch b/devfs/devfs-remove-devfs_mk_cdev.patch index 8b9d1b17ecb44b..c539b622ad65c1 100644 --- a/devfs/devfs-remove-devfs_mk_cdev.patch +++ b/devfs/devfs-remove-devfs_mk_cdev.patch @@ -833,7 +833,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> &class_device_attr_name); --- gregkh-2.6.orig/drivers/net/ppp_generic.c +++ gregkh-2.6/drivers/net/ppp_generic.c -@@ -865,10 +865,6 @@ static int __init ppp_init(void) +@@ -862,10 +862,6 @@ static int __init ppp_init(void) goto out_chrdev; } class_device_create(ppp_class, NULL, MKDEV(PPP_MAJOR, 0), NULL, "ppp"); @@ -844,7 +844,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } out: -@@ -876,9 +872,6 @@ out: +@@ -873,9 +869,6 @@ out: printk(KERN_ERR "failed to register PPP device (%d)\n", err); return err; diff --git a/devfs/devfs-remove-devfs_mk_dir.patch b/devfs/devfs-remove-devfs_mk_dir.patch index 2f12a7ba26991a..75a91639d1ab72 100644 --- a/devfs/devfs-remove-devfs_mk_dir.patch +++ b/devfs/devfs-remove-devfs_mk_dir.patch @@ -486,7 +486,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/drivers/mmc/mmc_block.c +++ gregkh-2.6/drivers/mmc/mmc_block.c -@@ -498,7 +498,6 @@ static int __init mmc_blk_init(void) +@@ -502,7 +502,6 @@ static int __init mmc_blk_init(void) if (major == 0) major = res; diff --git a/devfs/devfs-remove-devfs_remove.patch b/devfs/devfs-remove-devfs_remove.patch index d273c69bcb5bf7..1bc299ba6d3b2b 100644 --- a/devfs/devfs-remove-devfs_remove.patch +++ b/devfs/devfs-remove-devfs_remove.patch @@ -843,7 +843,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } --- gregkh-2.6.orig/drivers/mmc/mmc_block.c +++ gregkh-2.6/drivers/mmc/mmc_block.c -@@ -507,7 +507,6 @@ static int __init mmc_blk_init(void) +@@ -511,7 +511,6 @@ static int __init mmc_blk_init(void) static void __exit mmc_blk_exit(void) { mmc_unregister_driver(&mmc_driver); @@ -1037,7 +1037,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> up(&videodev_lock); --- gregkh-2.6.orig/drivers/net/ppp_generic.c +++ gregkh-2.6/drivers/net/ppp_generic.c -@@ -2676,7 +2676,6 @@ static void __exit ppp_cleanup(void) +@@ -2673,7 +2673,6 @@ static void __exit ppp_cleanup(void) cardmap_destroy(&all_ppp_units); if (unregister_chrdev(PPP_MAJOR, "ppp") != 0) printk(KERN_ERR "PPP: failed to unregister PPP device\n"); diff --git a/devfs/devfs-remove-scsi-devfs_name.patch b/devfs/devfs-remove-scsi-devfs_name.patch index dea04c6ffe43ca..96fd93e151b5ae 100644 --- a/devfs/devfs-remove-scsi-devfs_name.patch +++ b/devfs/devfs-remove-scsi-devfs_name.patch @@ -15,7 +15,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- --- gregkh-2.6.orig/drivers/scsi/scsi_scan.c +++ gregkh-2.6/drivers/scsi/scsi_scan.c -@@ -719,12 +719,8 @@ static int scsi_add_lun(struct scsi_devi +@@ -720,12 +720,8 @@ static int scsi_add_lun(struct scsi_devi if (inq_result[7] & 0x10) sdev->sdtr = 1; diff --git a/pci/drivers-net-replace-pci_module_init-with-pci_register_driver.patch b/pci/drivers-net-replace-pci_module_init-with-pci_register_driver.patch index a44c25aacb66c5..02d9bbc22be9fd 100644 --- a/pci/drivers-net-replace-pci_module_init-with-pci_register_driver.patch +++ b/pci/drivers-net-replace-pci_module_init-with-pci_register_driver.patch @@ -272,7 +272,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> static void __exit fealnx_exit(void) --- gregkh-2.6.orig/drivers/net/forcedeth.c +++ gregkh-2.6/drivers/net/forcedeth.c -@@ -2720,7 +2720,7 @@ static struct pci_driver driver = { +@@ -2721,7 +2721,7 @@ static struct pci_driver driver = { static int __init init_nic(void) { printk(KERN_INFO "forcedeth.c: Reverse Engineered nForce ethernet driver. Version %s.\n", FORCEDETH_VERSION); @@ -514,7 +514,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> static void __exit tc35815_cleanup_module(void) --- gregkh-2.6.orig/drivers/net/tg3.c +++ gregkh-2.6/drivers/net/tg3.c -@@ -10946,7 +10946,7 @@ static struct pci_driver tg3_driver = { +@@ -10951,7 +10951,7 @@ static struct pci_driver tg3_driver = { static int __init tg3_init(void) { @@ -767,7 +767,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return ret; --- gregkh-2.6.orig/drivers/net/wireless/orinoco_nortel.c +++ gregkh-2.6/drivers/net/wireless/orinoco_nortel.c -@@ -287,7 +287,7 @@ MODULE_LICENSE("Dual MPL/GPL"); +@@ -291,7 +291,7 @@ MODULE_LICENSE("Dual MPL/GPL"); static int __init nortel_pci_init(void) { printk(KERN_DEBUG "%s\n", version); diff --git a/pci/x86-pci-domain-support-struct-pci_sysdata.patch b/pci/x86-pci-domain-support-struct-pci_sysdata.patch index a1224ee9a961b1..4bf9e4cb351c3d 100644 --- a/pci/x86-pci-domain-support-struct-pci_sysdata.patch +++ b/pci/x86-pci-domain-support-struct-pci_sysdata.patch @@ -141,7 +141,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> +++ gregkh-2.6/include/asm-x86_64/topology.h @@ -25,7 +25,7 @@ extern int __node_distance(int, int); #define parent_node(node) (node) - #define node_to_first_cpu(node) (__ffs(node_to_cpumask[node])) + #define node_to_first_cpu(node) (first_cpu(node_to_cpumask[node])) #define node_to_cpumask(node) (node_to_cpumask[node]) -#define pcibus_to_node(bus) ((long)(bus->sysdata)) +#define pcibus_to_node(bus) ((struct pci_sysdata *)((bus)->sysdata))->node |