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

1 files changed, 22 insertions, 0 deletions

diff --git a/include/uapi/linux/if_cablemodem.h b/include/uapi/linux/if_cablemodem.h
new file mode 100644
index 000000000000..9ca1007edd93
--- /dev/null
+++ b/include/uapi/linux/if_cablemodem.h
@@ -0,0 +1,22 @@
+#ifndef _LINUX_CABLEMODEM_H_
+#define _LINUX_CABLEMODEM_H_
+/*
+ *              Author: Franco Venturi <fventuri@mediaone.net>
+ *              Copyright 1998 Franco Venturi
+ *
+ *              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.
+ */
+
+/* some useful defines for sb1000.c e cmconfig.c - fv */
+#define SIOCGCMSTATS            SIOCDEVPRIVATE+0        /* get cable modem stats */
+#define SIOCGCMFIRMWARE         SIOCDEVPRIVATE+1        /* get cm firmware version */
+#define SIOCGCMFREQUENCY        SIOCDEVPRIVATE+2        /* get cable modem frequency */
+#define SIOCSCMFREQUENCY        SIOCDEVPRIVATE+3        /* set cable modem frequency */
+#define SIOCGCMPIDS                     SIOCDEVPRIVATE+4        /* get cable modem PIDs */
+#define SIOCSCMPIDS                     SIOCDEVPRIVATE+5        /* set cable modem PIDs */
+
+#endif