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

1 files changed, 24 insertions, 0 deletions

diff --git a/include/uapi/linux/atmppp.h b/include/uapi/linux/atmppp.h
new file mode 100644
index 000000000000..300dcce0c83f
--- /dev/null
+++ b/include/uapi/linux/atmppp.h
@@ -0,0 +1,24 @@
+/* atmppp.h - RFC2364 PPPoATM */
+
+/* Written 2000 by Mitchell Blank Jr */
+
+#ifndef _LINUX_ATMPPP_H
+#define _LINUX_ATMPPP_H
+
+#include <linux/atm.h>
+
+#define PPPOATM_ENCAPS_AUTODETECT       (0)
+#define PPPOATM_ENCAPS_VC               (1)
+#define PPPOATM_ENCAPS_LLC              (2)
+
+/*
+ * This is for the ATM_SETBACKEND call - these are like socket families:
+ * the first element of the structure is the backend number and the rest
+ * is per-backend specific
+ */
+struct atm_backend_ppp {
+        atm_backend_t   backend_num;    /* ATM_BACKEND_PPP */
+        int             encaps;         /* PPPOATM_ENCAPS_* */
+};
+
+#endif  /* _LINUX_ATMPPP_H */