From: Andrew Morton <akpm@linux-foundation.org>

drivers/firewire/fw-device.c:500: error: unknown field 'attrs' specified in initializer
drivers/firewire/fw-device.c:500: warning: initialization from incompatible pointer type
drivers/firewire/fw-device.c:594: error: unknown field 'attrs' specified in initializer
drivers/firewire/fw-device.c:594: warning: initialization from incompatible pointer type

It sucks to be me.

Stop changing stuff.

Cc: Stefan Richter <stefanr@s5r6.in-berlin.de>
Cc: Kay Sievers <kay.sievers@vrfy.org>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/firewire/fw-device.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff -puN drivers/firewire/fw-device.c~git-ieee1394-vs-gregkh-driver-driver-core-use-attribute-groups-in-struct-device_type drivers/firewire/fw-device.c
--- a/drivers/firewire/fw-device.c~git-ieee1394-vs-gregkh-driver-driver-core-use-attribute-groups-in-struct-device_type
+++ a/drivers/firewire/fw-device.c
@@ -497,7 +497,7 @@ static void fw_unit_release(struct devic
 }
 
 static struct device_type fw_unit_type = {
-	.attrs		= fw_unit_attributes,
+//	.attrs		= fw_unit_attributes,
 	.uevent		= fw_unit_uevent,
 	.release	= fw_unit_release,
 };
@@ -591,7 +591,7 @@ static void fw_device_shutdown(struct wo
 }
 
 static struct device_type fw_device_type = {
-	.attrs		= fw_device_attributes,
+//	.attrs		= fw_device_attributes,
 	.release	= fw_device_release,
 };
 
_