diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-01-12 07:59:05 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-01-12 07:59:05 -0500 |
| commit | 163849ea9b4c5d50fbd324692461983d18faadad (patch) | |
| tree | 7176a18fea53560eb4092aa103d94a266ab4e60d /include/linux/x25.h | |
| parent | 2138301e1687bd4f22aa2b4df4829b6ffdae19bc (diff) | |
| parent | 5ee518ecbcb5934e284ea51a19a939c891f5f7ea (diff) | |
Merge branch 'for-2.6.33' into for-2.6.34
Diffstat (limited to 'include/linux/x25.h')
| -rw-r--r-- | include/linux/x25.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/x25.h b/include/linux/x25.h index d035e4e87d07..6450a7f12074 100644 --- a/include/linux/x25.h +++ b/include/linux/x25.h | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | #define SIOCX25SENDCALLACCPT (SIOCPROTOPRIVATE + 9) | 25 | #define SIOCX25SENDCALLACCPT (SIOCPROTOPRIVATE + 9) |
| 26 | #define SIOCX25GDTEFACILITIES (SIOCPROTOPRIVATE + 10) | 26 | #define SIOCX25GDTEFACILITIES (SIOCPROTOPRIVATE + 10) |
| 27 | #define SIOCX25SDTEFACILITIES (SIOCPROTOPRIVATE + 11) | 27 | #define SIOCX25SDTEFACILITIES (SIOCPROTOPRIVATE + 11) |
| 28 | #define SIOCX25SCAUSEDIAG (SIOCPROTOPRIVATE + 12) | ||
| 28 | 29 | ||
| 29 | /* | 30 | /* |
| 30 | * Values for {get,set}sockopt. | 31 | * Values for {get,set}sockopt. |