firewire: Add device probing and sysfs integration.

Signed-off-by: Kristian Høgsberg <krh@redhat.com>
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

diff --git a/drivers/firewire/Makefile b/drivers/firewire/Makefile
index db7020d..da77bc0 100644 (file)
--- a/drivers/firewire/Makefile
+++ b/drivers/firewire/Makefile
@@ -2,6 +2,7 @@
 # Makefile for the Linux IEEE 1394 implementation
 #
 
-fw-core-objs := fw-card.o fw-topology.o fw-transaction.o fw-iso.o
+fw-core-objs := fw-card.o fw-topology.o fw-transaction.o fw-iso.o \
+       fw-device.o fw-device-cdev.o
 
 obj-$(CONFIG_FW) += fw-core.o

diff --cc drivers/firewire/fw-card.c
Simple merge

diff --cc drivers/firewire/fw-device-cdev.c
Simple merge

diff --cc drivers/firewire/fw-device-cdev.h
Simple merge

diff --cc drivers/firewire/fw-device.c
Simple merge

diff --cc drivers/firewire/fw-device.h
Simple merge

diff --cc drivers/firewire/fw-iso.c
Simple merge

diff --cc drivers/firewire/fw-topology.c
Simple merge

diff --cc drivers/firewire/fw-transaction.c
Simple merge

diff --cc drivers/firewire/fw-transaction.h
Simple merge