aboutsummaryrefslogtreecommitdiffstats
path: root/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
diff options
context:
space:
mode:
authorKeir Fraser <keir@xensource.com>2007-10-25 15:54:19 +0100
committerKeir Fraser <keir@xensource.com>2007-10-25 15:54:19 +0100
commitbb59a254afbc5cef94d6b02d707bcf6906c59b05 (patch)
tree53eff041b7618d55a72637a8c1c67277a680ddb4 /unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
parent80273cb18f581206d41a47f011e85d7badee02dc (diff)
downloadxen-bb59a254afbc5cef94d6b02d707bcf6906c59b05.tar.gz
xen-bb59a254afbc5cef94d6b02d707bcf6906c59b05.tar.bz2
xen-bb59a254afbc5cef94d6b02d707bcf6906c59b05.zip
pv-on-hvm: fixes for unmodified drivers build and modern Linux
- The adjustments to README and overrides.mk are generic. - The removal of explicit linux/config.h inclusion should also not cause any issues. - The introduction of irq_handler_t should eliminiate warnings on 2.6.19+ kernels (I didn't check they're there, but since the request_irq prototype changed, I'm sure there's at least one. However, as a result changes to the Linux tree are expected to be required. - The change setup_xen_features -> xen_setup_features follows the naming in mainline 2.6.23 but would apparently also require changes to the Linux tree. - The changes SA_* -> IRQF_ and pci_module_init -> pci_register_driver should also not cause issues. Signed-off-by: Jan Beulich <jbeulich@novell.com>
Diffstat (limited to 'unmodified_drivers/linux-2.6/platform-pci/platform-pci.c')
-rw-r--r--unmodified_drivers/linux-2.6/platform-pci/platform-pci.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c b/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
index e147f3d59a..7a512073d2 100644
--- a/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
+++ b/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
@@ -367,7 +367,11 @@ static int __init platform_pci_module_init(void)
{
int rc;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)
rc = pci_module_init(&platform_driver);
+#else
+ rc = pci_register_driver(&platform_driver);
+#endif
if (rc) {
printk(KERN_INFO DRV_NAME
": No platform pci device model found\n");