Remove at76_usbdfu.h - header for one function is an overkill

5 files changed, 7 insertions, 34 deletions

diff --git a/Makefile b/Makefile
index 469bb7a..7e035c7 100644
--- a/Makefile
+++ b/Makefile
@@ -35,14 +35,11 @@ obj-m = at76_usb.o
 
 at76_usb-objs = at76c503.o at76_usbdfu.o
 
-SRCS = at76c503.c at76_usbdfu.c
-
-HDRS = at76c503.h at76_usbdfu.h
+SRCS = at76c503.c at76_usbdfu.c at76c503.h
 
 SPECFILE = at76c503a.spec
 
-DISTFILES = $(SRCS) $(HDRS) Makefile README COPYING CHANGELOG \
-	kernel_patch.diff
+DISTFILES = $(SRCS) Makefile README COPYING CHANGELOG kernel_patch.diff
 
 # get the version from at76c503.h
 ifndef M
@@ -82,7 +79,7 @@ uninstall:
 
 TAGS:
 	rm -f TAGS
-	etags --append $(SRCS) $(HDRS)
+	etags --append $(SRCS)
 
 clean:
 	rm -f core *.o *~ a.out *.d
diff --git a/at76_usbdfu.c b/at76_usbdfu.c
index e46c865..2291594 100644
--- a/at76_usbdfu.c
+++ b/at76_usbdfu.c
@@ -27,8 +27,7 @@
 #include <linux/config.h>
 #include <linux/slab.h>
 #include <linux/usb.h>
-#include "at76c503.h" /* for dbg() */
-#include "at76_usbdfu.h"
+#include "at76c503.h"
 
 #ifdef DEBUG_SEM
   #define dfu_down(sem) do { dbg(DBG_DFU, "sem %s down", #sem); down(sem); } while (0)
diff --git a/at76_usbdfu.h b/at76_usbdfu.h
deleted file mode 100644
index 83e9f22..0000000
--- a/at76_usbdfu.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* -*- linux-c -*- */
-/*
- * USB Device Firmware Upgrade (DFU) handler
- *
- * Copyright (c) 2003 Oliver Kurth
- * Copyright (c) 2004 Joerg Albert <joerg.albert@gmx.de>
- *
- *	This program is free software; you can redistribute it and/or
- *	modify it under the terms of the GNU General Public License as
- *	published by the Free Software Foundation; either version 2 of
- *	the License, or (at your option) any later version.
- *
- * This file is part of the Berlios driver for WLAN USB devices based on the 
- * Atmel AT76C503A/505/505A. See at76c503.h for details.
- */
-
-#ifndef _USBDFU_H
-#define _USBDFU_H
-
-#include <linux/usb.h>
-
-int usbdfu_download(struct usb_device *udev, u8 *fw_buf, u32 fw_len,
-		    int manifest_sync_timeout);
-
-#endif /* _USBDFU_H */
diff --git a/at76c503.c b/at76c503.c
index c905728..ace38a3 100644
--- a/at76c503.c
+++ b/at76c503.c
@@ -47,7 +47,6 @@
 #endif
 
 #include "at76c503.h"
-#include "at76_usbdfu.h"
 
 #if WIRELESS_EXT < 20
 #define IW_QUAL_QUAL_UPDATED    0x01    /* Value was updated since last read */
diff --git a/at76c503.h b/at76c503.h
index 6ed549c..2659deb 100644
--- a/at76c503.h
+++ b/at76c503.h
@@ -723,4 +723,7 @@ extern int at76_debug;
 		printk(KERN_DEBUG __FILE__ ": " format "\n" , ## arg);\
 	} while (0)
 
+int usbdfu_download(struct usb_device *udev, u8 *fw_buf, u32 fw_len,
+		    int manifest_sync_timeout);
+
 #endif /* _AT76C503_H */