diff options
| author | Eric Paris <eparis@redhat.com> | 2014-03-07 11:41:32 -0500 |
|---|---|---|
| committer | Eric Paris <eparis@redhat.com> | 2014-03-07 11:41:32 -0500 |
| commit | b7d3622a39fde7658170b7f3cf6c6889bb8db30d (patch) | |
| tree | 64f4e781ecb2a85d675e234072b988560bcd25f1 /include/linux/atmel_serial.h | |
| parent | f3411cb2b2e396a41ed3a439863f028db7140a34 (diff) | |
| parent | d8ec26d7f8287f5788a494f56e8814210f0e64be (diff) | |
Merge tag 'v3.13' into for-3.15
Linux 3.13
Conflicts:
include/net/xfrm.h
Simple merge where v3.13 removed 'extern' from definitions and the audit
tree did s/u32/unsigned int/ to the same definitions.
Diffstat (limited to 'include/linux/atmel_serial.h')
| -rw-r--r-- | include/linux/atmel_serial.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/atmel_serial.h b/include/linux/atmel_serial.h index be201ca2990c..00beddf6be20 100644 --- a/include/linux/atmel_serial.h +++ b/include/linux/atmel_serial.h | |||
| @@ -125,5 +125,6 @@ | |||
| 125 | #define ATMEL_US_IF 0x4c /* IrDA Filter Register */ | 125 | #define ATMEL_US_IF 0x4c /* IrDA Filter Register */ |
| 126 | 126 | ||
| 127 | #define ATMEL_US_NAME 0xf0 /* Ip Name */ | 127 | #define ATMEL_US_NAME 0xf0 /* Ip Name */ |
| 128 | #define ATMEL_US_VERSION 0xfc /* Ip Version */ | ||
| 128 | 129 | ||
| 129 | #endif | 130 | #endif |