Merge tag 'v3.7-rc3' into next to sync up with recent USB and MFD changes

1 files changed, 0 insertions, 39 deletions

diff --git a/include/linux/baycom.h b/include/linux/baycom.h
deleted file mode 100644
index 81249e029dad..000000000000
--- a/include/linux/baycom.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * The Linux BAYCOM driver for the Baycom serial 1200 baud modem
- * and the parallel 9600 baud modem
- * (C) 1997-1998 by Thomas Sailer, HB9JNX/AE4WA
- */
-
-#ifndef _BAYCOM_H
-#define _BAYCOM_H
-
-/* -------------------------------------------------------------------- */
-/*
- * structs for the IOCTL commands
- */
-
-struct baycom_debug_data {
-        unsigned long debug1;
-        unsigned long debug2;
-        long debug3;
-};
-
-struct baycom_ioctl {
-        int cmd;
-        union {
-                struct baycom_debug_data dbg;
-        } data;
-};
-
-/* -------------------------------------------------------------------- */
-
-/*
- * ioctl values change for baycom
- */
-#define BAYCOMCTL_GETDEBUG       0x92
-
-/* -------------------------------------------------------------------- */
-
-#endif /* _BAYCOM_H */
-
-/* --------------------------------------------------------------------- */