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

1 files changed, 27 insertions, 0 deletions

diff --git a/include/uapi/linux/if_plip.h b/include/uapi/linux/if_plip.h
new file mode 100644
index 000000000000..6298c7e88b2b
--- /dev/null
+++ b/include/uapi/linux/if_plip.h
@@ -0,0 +1,27 @@
+/*
+ *      NET3    PLIP tuning facilities for the new Niibe PLIP.
+ *
+ *      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.
+ *
+ */
+ 
+#ifndef _LINUX_IF_PLIP_H
+#define _LINUX_IF_PLIP_H
+
+#include <linux/sockios.h>
+
+#define SIOCDEVPLIP     SIOCDEVPRIVATE
+
+struct plipconf {
+        unsigned short pcmd;
+        unsigned long  nibble;
+        unsigned long  trigger;
+};
+
+#define PLIP_GET_TIMEOUT        0x1
+#define PLIP_SET_TIMEOUT        0x2
+
+#endif