From 72d5d909e39258bddfab3896f7e97e3810b587c5 Mon Sep 17 00:00:00 2001
From: Jiri Slaby <jirislaby@gmail.com>
Date: Fri, 21 Jul 2006 14:51:02 -0700
Subject: [PATCH] --- yaml --- r: 32788 b: refs/heads/master c:
 a0ee7c70b22f78593957f99faa06acb4747b8bc0 h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/net/sunhme.c | 9 ++-------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index b9655e049401..290f0fb0fa80 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 485fb2c998a37d5c3c6aa082aa451e66db90f34a
+refs/heads/master: a0ee7c70b22f78593957f99faa06acb4747b8bc0
diff --git a/trunk/drivers/net/sunhme.c b/trunk/drivers/net/sunhme.c
index 8673fd4c08c7..c6f5bc3c042f 100644
--- a/trunk/drivers/net/sunhme.c
+++ b/trunk/drivers/net/sunhme.c
@@ -3255,12 +3255,7 @@ static void __devexit happy_meal_pci_remove(struct pci_dev *pdev)
 }
 
 static struct pci_device_id happymeal_pci_ids[] = {
-	{
-	  .vendor	= PCI_VENDOR_ID_SUN,
-	  .device	= PCI_DEVICE_ID_SUN_HAPPYMEAL,
-	  .subvendor	= PCI_ANY_ID,
-	  .subdevice	= PCI_ANY_ID,
-	},
+	{ PCI_DEVICE(PCI_VENDOR_ID_SUN, PCI_DEVICE_ID_SUN_HAPPYMEAL) },
 	{ }			/* Terminating entry */
 };
 
@@ -3275,7 +3270,7 @@ static struct pci_driver hme_pci_driver = {
 
 static int __init happy_meal_pci_init(void)
 {
-	return pci_module_init(&hme_pci_driver);
+	return pci_register_driver(&hme_pci_driver);
 }
 
 static void happy_meal_pci_exit(void)