From 8b4a98409db64c77fc3324f23aacf7b42b55de57 Mon Sep 17 00:00:00 2001 From: Luiz Souza Date: Mon, 19 Feb 2018 11:29:01 -0600 Subject: Fix a mismerge. --- sys/sys/param.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'sys/sys') diff --git a/sys/sys/param.h b/sys/sys/param.h index da63fac..ad25a3c 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -84,12 +84,10 @@ #define P_OSREL_SHUTDOWN_ENOTCONN 1100077 #define P_OSREL_MAP_GUARD 1200035 #define P_OSREL_MAP_GUARD_11 1101501 -<<<<<<< HEAD #define P_OSREL_MAP_GUARD_11_1 1101001 -======= #define P_OSREL_WRFSBASE 1200041 #define P_OSREL_WRFSBASE_11 1101503 ->>>>>>> b1a7a7418e7... MFC r322762, r322799, r322832, r322833: +#define P_OSREL_WRFSBASE_11_1 1101001 #define P_OSREL_MAJOR(x) ((x) / 100000) #endif -- cgit v1.1