Subject: linux-next: build failure after merge of the driver-core tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 4 Aug 2010 14:25:31 +1000

Hi Greg,

After merging the driver-core tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/pci/pci-label.c:100: error: unknown field 'owner' specified in initializer
drivers/pci/pci-label.c:100: warning: initialization from incompatible pointer type
drivers/pci/pci-label.c:105: error: unknown field 'owner' specified in initializer
drivers/pci/pci-label.c:105: warning: initialization from incompatible pointer type

Caused by commit 60cc62ad579afa0eb5bded82e08dd0617d461d52 ("sysfs: Remove
owner field from sysfs struct attribute") interacting with commit
911e1c9b05a8e3559a7aa89083930700a0b9e7ee ("PCI: export SMBIOS provided
firmware instance and label to sysfs") from the pci tree.

I applied the following merge fix patch (Jesse, this patch can already be
applied to the pci tree without problems):

From: Stephen Rothwell <[email-masked]>
Date: Wed, 4 Aug 2010 14:21:42 +1000
Subject: [PATCH] pci: update for owner removal from struct device_attribute

Signed-off-by: Stephen Rothwell <[email-masked]>
---
 drivers/pci/pci-label.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/pci/pci-label.c b/drivers/pci/pci-label.c
index 111500e..90c0a72 100644
--- a/drivers/pci/pci-label.c
+++ b/drivers/pci/pci-label.c
@@ -97,12 +97,12 @@ smbiosinstance_show(struct device *dev,
 }
 
 static struct device_attribute smbios_attr_label = {
-	.attr = {.name = "label", .mode = 0444, .owner = THIS_MODULE},
+	.attr = {.name = "label", .mode = 0444},
 	.show = smbioslabel_show,
 };
 
 static struct device_attribute smbios_attr_instance = {
-	.attr = {.name = "index", .mode = 0444, .owner = THIS_MODULE},
+	.attr = {.name = "index", .mode = 0444},
 	.show = smbiosinstance_show,
 };
 
-- 
1.7.1

-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/