diff options
| author | Luiz Souza <luiz@netgate.com> | 2018-02-21 14:21:05 -0300 |
|---|---|---|
| committer | Luiz Souza <luiz@netgate.com> | 2018-02-21 14:21:05 -0300 |
| commit | 668c30eeaf0b27cd5fc4dd1bcea2cf9b0f3ecf65 (patch) | |
| tree | 283866608405b79d88c0fb91791e08ab15a55a47 | |
| parent | 0664f47828152fc8eec87c1679129310fda20f2e (diff) | |
| download | FreeBSD-src-668c30eeaf0b27cd5fc4dd1bcea2cf9b0f3ecf65.zip FreeBSD-src-668c30eeaf0b27cd5fc4dd1bcea2cf9b0f3ecf65.tar.gz | |
Revert "Fix a mismerge."
This reverts commit 8b4a98409db64c77fc3324f23aacf7b42b55de57.
| -rw-r--r-- | sys/sys/param.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/sys/param.h b/sys/sys/param.h index ad25a3c..da63fac 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -84,10 +84,12 @@ #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 -#define P_OSREL_WRFSBASE_11_1 1101001 +>>>>>>> b1a7a7418e7... MFC r322762, r322799, r322832, r322833: #define P_OSREL_MAJOR(x) ((x) / 100000) #endif |
