diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-08 20:32:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-08 20:32:43 -0700 |
| commit | 0c23664ee8c42f247dba7ceb620baabd892cef88 (patch) | |
| tree | e3f37e3260bd938b293cfb8f70f8969b19539973 /drivers | |
| parent | 6ec129c3a2f8b38bc37e42348470ccfcb7460146 (diff) | |
| parent | 127cda1e8cc282de1ca7a9dcc3866841977b9fcc (diff) | |
| download | op-kernel-dev-0c23664ee8c42f247dba7ceb620baabd892cef88.zip op-kernel-dev-0c23664ee8c42f247dba7ceb620baabd892cef88.tar.gz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC64]: Optimize fault kprobe handling just like powerpc.
[SPARC]: Wire up utimensat syscall.
[SPARC64]: Fix request_irq() ignored result warnings in PCI controller code.
[SPARC64]: Kill asm-sparc64/pbm.h
[ATYFB]: Fix sparc includes.
[QLA2XXX]: Fix build on sparc.
[SPARC64]: Removal of trivial pci_controller_info uses.
[SPARC64]: Move index info pci_pbm_info.
[SPARC64]: Move {setup,teardown}_msi_irq into pci_pbm_info.
[SPARC64]: Move pci_ops into pci_pbm_info.
[SPARC64] SBUS: Error interrupt registry cleanups.
[SPARC64] PCI: Use root list of pbm's instead of pci_controller_info's
[SPARC64] PCI: Kill PROM_PCIRNG_MAX and PROM_PCIIMAP_MAX.
[SPARC64] PCI: Use common routine to fetch PBM properties.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_init.c | 11 | ||||
| -rw-r--r-- | drivers/video/aty/atyfb_base.c | 3 | ||||
| -rw-r--r-- | drivers/video/aty/mach64_cursor.c | 1 |
3 files changed, 6 insertions, 9 deletions
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c index db998d8..2a45aec 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c @@ -13,7 +13,6 @@ #ifdef CONFIG_SPARC #include <asm/prom.h> -#include <asm/pbm.h> #endif /* XXX(hch): this is ugly, but we don't want to pull in exioctl.h */ @@ -1397,9 +1396,8 @@ static void qla2xxx_nvram_wwn_from_ofw(scsi_qla_host_t *ha, nvram_t *nv) { #ifdef CONFIG_SPARC struct pci_dev *pdev = ha->pdev; - struct pcidev_cookie *pcp = pdev->sysdata; - struct device_node *dp = pcp->prom_node; - u8 *val; + struct device_node *dp = pci_device_to_OF_node(pdev); + const u8 *val; int len; val = of_get_property(dp, "port-wwn", &len); @@ -3370,9 +3368,8 @@ static void qla24xx_nvram_wwn_from_ofw(scsi_qla_host_t *ha, struct nvram_24xx *n { #ifdef CONFIG_SPARC struct pci_dev *pdev = ha->pdev; - struct pcidev_cookie *pcp = pdev->sysdata; - struct device_node *dp = pcp->prom_node; - u8 *val; + struct device_node *dp = pci_device_to_OF_node(pdev); + const u8 *val; int len; val = of_get_property(dp, "port-wwn", &len); diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c index ea67dd9..8d3455d 100644 --- a/drivers/video/aty/atyfb_base.c +++ b/drivers/video/aty/atyfb_base.c @@ -80,8 +80,9 @@ #include "../macmodes.h" #endif #ifdef __sparc__ -#include <asm/pbm.h> #include <asm/fbio.h> +#include <asm/oplib.h> +#include <asm/prom.h> #endif #ifdef CONFIG_ADB_PMU diff --git a/drivers/video/aty/mach64_cursor.c b/drivers/video/aty/mach64_cursor.c index 2a7f381..fe2c6ad 100644 --- a/drivers/video/aty/mach64_cursor.c +++ b/drivers/video/aty/mach64_cursor.c @@ -11,7 +11,6 @@ #include <asm/uaccess.h> #ifdef __sparc__ -#include <asm/pbm.h> #include <asm/fbio.h> #endif |
