diff options
| -rw-r--r-- | drivers/firewire/Makefile | 2 | ||||
| -rw-r--r-- | drivers/firewire/fw-cdev.c (renamed from drivers/firewire/fw-device-cdev.c) | 2 | ||||
| -rw-r--r-- | include/linux/firewire-cdev.h (renamed from drivers/firewire/fw-device-cdev.h) | 0 |
3 files changed, 2 insertions, 2 deletions
diff --git a/drivers/firewire/Makefile b/drivers/firewire/Makefile index eddc16c701b5..7f02d6fe7a44 100644 --- a/drivers/firewire/Makefile +++ b/drivers/firewire/Makefile @@ -3,7 +3,7 @@ # fw-core-objs := fw-card.o fw-topology.o fw-transaction.o fw-iso.o \ - fw-device.o fw-device-cdev.o + fw-device.o fw-cdev.o obj-$(CONFIG_FIREWIRE) += fw-core.o obj-$(CONFIG_FIREWIRE_OHCI) += fw-ohci.o diff --git a/drivers/firewire/fw-device-cdev.c b/drivers/firewire/fw-cdev.c index 2910db69ec2c..88b8fd917f54 100644 --- a/drivers/firewire/fw-device-cdev.c +++ b/drivers/firewire/fw-cdev.c @@ -30,11 +30,11 @@ #include <linux/mm.h> #include <linux/idr.h> #include <linux/compat.h> +#include <linux/firewire-cdev.h> #include <asm/uaccess.h> #include "fw-transaction.h" #include "fw-topology.h" #include "fw-device.h" -#include "fw-device-cdev.h" /* dequeue_event() just kfree()'s the event, so the event has to be * the first field in the struct. */ diff --git a/drivers/firewire/fw-device-cdev.h b/include/linux/firewire-cdev.h index 026c768e3bf1..026c768e3bf1 100644 --- a/drivers/firewire/fw-device-cdev.h +++ b/include/linux/firewire-cdev.h |