From c171c0a74e08be8755d81701113d54d74d7ecb62 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Sun, 19 Jun 2005 12:21:43 +0200
Subject: [PATCH] --- yaml --- r: 2399 b: refs/heads/master c:
 87c8a4433b608261a9becdb0ce2d2f2ed4b71d05 h: refs/heads/master i:   2397:
 6f6829ba5aeb3dcbfeba809b5b35e22859354074   2395:
 7c1be01ac1966ff22fbee67241fc00cde60fd5f7   2391:
 1a266c0edfd4e28b477510b3a7c295d194aea367   2383:
 41462e384993a2794721b0a5102807b1423c70df   2367:
 a37675db23c939bcfb2393058ee06a1352a4f62f v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/pci/pci-sysfs.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 0afaf79a066f..5641af3f57f9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4893e9d1cfeb614b5155c43eefbb338b4f02cb34
+refs/heads/master: 87c8a4433b608261a9becdb0ce2d2f2ed4b71d05
diff --git a/trunk/drivers/pci/pci-sysfs.c b/trunk/drivers/pci/pci-sysfs.c
index 8b79609a3a03..a15f94072a6f 100644
--- a/trunk/drivers/pci/pci-sysfs.c
+++ b/trunk/drivers/pci/pci-sysfs.c
@@ -73,7 +73,7 @@ resource_show(struct device * dev, struct device_attribute *attr, char * buf)
 	return (str - buf);
 }
 
-static ssize_t modalias_show(struct device *dev, char *buf)
+static ssize_t modalias_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
 	struct pci_dev *pci_dev = to_pci_dev(dev);