diff -ruN linux-2.6.37.2/include/linux/if_arp.h linux-2.6.37.2-flexray/include/linux/if_arp.h
--- linux-2.6.37.2/include/linux/if_arp.h	2011-02-25 00:09:00.000000000 +0100
+++ linux-2.6.37.2-flexray/include/linux/if_arp.h	2011-03-05 13:29:15.000000000 +0100
@@ -53,6 +53,7 @@
 #define ARPHRD_X25	271		/* CCITT X.25			*/
 #define ARPHRD_HWX25	272		/* Boards with X.25 in firmware	*/
 #define ARPHRD_CAN	280		/* Controller Area Network      */
+#define ARPHRD_FLEXRAY	281		/* FlexRay                      */
 #define ARPHRD_PPP	512
 #define ARPHRD_CISCO	513		/* Cisco HDLC	 		*/
 #define ARPHRD_HDLC	ARPHRD_CISCO
diff -ruN linux-2.6.37.2/include/linux/if_ether.h linux-2.6.37.2-flexray/include/linux/if_ether.h
--- linux-2.6.37.2/include/linux/if_ether.h	2011-02-25 00:09:00.000000000 +0100
+++ linux-2.6.37.2-flexray/include/linux/if_ether.h	2011-03-05 13:29:49.000000000 +0100
@@ -96,6 +96,7 @@
 #define ETH_P_WAN_PPP   0x0007          /* Dummy type for WAN PPP frames*/
 #define ETH_P_PPP_MP    0x0008          /* Dummy type for PPP MP frames */
 #define ETH_P_LOCALTALK 0x0009		/* Localtalk pseudo type 	*/
+#define ETH_P_FLEXRAY	0x000A		/* FlexRay			*/
 #define ETH_P_CAN	0x000C		/* Controller Area Network      */
 #define ETH_P_PPPTALK	0x0010		/* Dummy type for Atalk over PPP*/
 #define ETH_P_TR_802_2	0x0011		/* 802.2 frames 		*/
diff -ruN linux-2.6.37.2/include/linux/socket.h linux-2.6.37.2-flexray/include/linux/socket.h
--- linux-2.6.37.2/include/linux/socket.h	2011-02-25 00:09:00.000000000 +0100
+++ linux-2.6.37.2-flexray/include/linux/socket.h	2011-03-05 13:30:55.000000000 +0100
@@ -193,7 +193,8 @@
 #define AF_PHONET	35	/* Phonet sockets		*/
 #define AF_IEEE802154	36	/* IEEE802154 sockets		*/
 #define AF_CAIF		37	/* CAIF sockets			*/
-#define AF_MAX		38	/* For now.. */
+#define AF_FLEXRAY	38	/* FlexRay sockets              */
+#define AF_MAX		39	/* For now.. */
 
 /* Protocol families, same as address families. */
 #define PF_UNSPEC	AF_UNSPEC
@@ -234,6 +235,7 @@
 #define PF_PHONET	AF_PHONET
 #define PF_IEEE802154	AF_IEEE802154
 #define PF_CAIF		AF_CAIF
+#define PF_FLEXRAY	AF_FLEXRAY
 #define PF_MAX		AF_MAX
 
 /* Maximum queue length specifiable by listen.  */
diff -ruN linux-2.6.37.2/include/linux/tty.h linux-2.6.37.2-flexray/include/linux/tty.h
--- linux-2.6.37.2/include/linux/tty.h	2011-02-25 00:09:00.000000000 +0100
+++ linux-2.6.37.2-flexray/include/linux/tty.h	2011-03-05 13:31:36.000000000 +0100
@@ -50,6 +50,8 @@
 #define N_CAIF		20      /* CAIF protocol for talking to modems */
 #define N_GSM0710	21	/* GSM 0710 Mux */
 #define N_TI_WL		22	/* for TI's WL BT, FM, GPS combo chips */
+#define N_SLFLEXRAY	23	/* Serial / USB serial FlexRay adapters */
+
 
 /*
  * This character is the same as _POSIX_VDISABLE: it cannot be used as
diff -ruN linux-2.6.37.2/net/core/sock.c linux-2.6.37.2-flexray/net/core/sock.c
--- linux-2.6.37.2/net/core/sock.c	2011-02-25 00:09:00.000000000 +0100
+++ linux-2.6.37.2-flexray/net/core/sock.c	2011-03-05 13:32:28.000000000 +0100
@@ -158,6 +158,7 @@
   "sk_lock-AF_TIPC"  , "sk_lock-AF_BLUETOOTH", "sk_lock-IUCV"        ,
   "sk_lock-AF_RXRPC" , "sk_lock-AF_ISDN"     , "sk_lock-AF_PHONET"   ,
   "sk_lock-AF_IEEE802154", "sk_lock-AF_CAIF" ,
+  "sk_lock-AF_FLEXRAY",
   "sk_lock-AF_MAX"
 };
 static const char *const af_family_slock_key_strings[AF_MAX+1] = {
@@ -174,6 +175,7 @@
   "slock-AF_TIPC"  , "slock-AF_BLUETOOTH", "slock-AF_IUCV"     ,
   "slock-AF_RXRPC" , "slock-AF_ISDN"     , "slock-AF_PHONET"   ,
   "slock-AF_IEEE802154", "slock-AF_CAIF" ,
+  "slock-AF_FLEXRAY",
   "slock-AF_MAX"
 };
 static const char *const af_family_clock_key_strings[AF_MAX+1] = {
@@ -190,6 +192,7 @@
   "clock-AF_TIPC"  , "clock-AF_BLUETOOTH", "clock-AF_IUCV"     ,
   "clock-AF_RXRPC" , "clock-AF_ISDN"     , "clock-AF_PHONET"   ,
   "clock-AF_IEEE802154", "clock-AF_CAIF" ,
+  "clock-AF_FLEXRAY",
   "clock-AF_MAX"
 };