diff options
author | Mauro Carvalho Chehab | 2012-10-17 09:32:49 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab | 2012-10-17 09:32:49 -0300 |
commit | 214e2ca2b82d335935a861c253fe94c61ad77aad (patch) | |
tree | eee42ff74d10470789d919b8499737ad0e919360 /include/linux/atmppp.h | |
parent | 1fdead8ad31d3aa833bc37739273fcde89ace93c (diff) | |
parent | ddffeb8c4d0331609ef2581d84de4d763607bd37 (diff) |
Merge tag 'v3.7-rc1' into staging/for_v3.8
Linux 3.7-rc1
* tag 'v3.7-rc1': (9579 commits)
Linux 3.7-rc1
x86, boot: Explicitly include autoconf.h for hostprogs
perf: Fix UAPI fallout
ARM: config: make sure that platforms are ordered by option string
ARM: config: sort select statements alphanumerically
UAPI: (Scripted) Disintegrate include/linux/byteorder
UAPI: (Scripted) Disintegrate include/linux
UAPI: Unexport linux/blk_types.h
UAPI: Unexport part of linux/ppp-comp.h
perf: Handle new rbtree implementation
procfs: don't need a PATH_MAX allocation to hold a string representation of an int
vfs: embed struct filename inside of names_cache allocation if possible
audit: make audit_inode take struct filename
vfs: make path_openat take a struct filename pointer
vfs: turn do_path_lookup into wrapper around struct filename variant
audit: allow audit code to satisfy getname requests from its names_list
vfs: define struct filename and have getname() return it
btrfs: Fix compilation with user namespace support enabled
userns: Fix posix_acl_file_xattr_userns gid conversion
userns: Properly print bluetooth socket uids
...
Diffstat (limited to 'include/linux/atmppp.h')
-rw-r--r-- | include/linux/atmppp.h | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/include/linux/atmppp.h b/include/linux/atmppp.h deleted file mode 100644 index 300dcce0c83f..000000000000 --- a/include/linux/atmppp.h +++ /dev/null @@ -1,24 +0,0 @@ -/* atmppp.h - RFC2364 PPPoATM */ - -/* Written 2000 by Mitchell Blank Jr */ - -#ifndef _LINUX_ATMPPP_H -#define _LINUX_ATMPPP_H - -#include <linux/atm.h> - -#define PPPOATM_ENCAPS_AUTODETECT (0) -#define PPPOATM_ENCAPS_VC (1) -#define PPPOATM_ENCAPS_LLC (2) - -/* - * This is for the ATM_SETBACKEND call - these are like socket families: - * the first element of the structure is the backend number and the rest - * is per-backend specific - */ -struct atm_backend_ppp { - atm_backend_t backend_num; /* ATM_BACKEND_PPP */ - int encaps; /* PPPOATM_ENCAPS_* */ -}; - -#endif /* _LINUX_ATMPPP_H */ |