diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-21 18:41:27 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-21 18:41:27 -0400 |
| commit | 429f731dea577bdd43693940cdca524135287e6a (patch) | |
| tree | 932337b7d23dd736612c6b6e6601c50bc24cfc5f /include/linux/kernelcapi.h | |
| parent | 85b375a613085b78531ec86369a51c2f3b922f95 (diff) | |
| parent | d2f5e80862d33a7746a40569840248a592dbc395 (diff) | |
Merge branch 'semaphore' of git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc
* 'semaphore' of git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc:
Deprecate the asm/semaphore.h files in feature-removal-schedule.
Convert asm/semaphore.h users to linux/semaphore.h
security: Remove unnecessary inclusions of asm/semaphore.h
lib: Remove unnecessary inclusions of asm/semaphore.h
kernel: Remove unnecessary inclusions of asm/semaphore.h
include: Remove unnecessary inclusions of asm/semaphore.h
fs: Remove unnecessary inclusions of asm/semaphore.h
drivers: Remove unnecessary inclusions of asm/semaphore.h
net: Remove unnecessary inclusions of asm/semaphore.h
arch: Remove unnecessary inclusions of asm/semaphore.h
Diffstat (limited to 'include/linux/kernelcapi.h')
| -rw-r--r-- | include/linux/kernelcapi.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/kernelcapi.h b/include/linux/kernelcapi.h index 8c4350a9ed87..a53e932f80fb 100644 --- a/include/linux/kernelcapi.h +++ b/include/linux/kernelcapi.h | |||
| @@ -48,7 +48,6 @@ typedef struct kcapi_carddef { | |||
| 48 | #include <linux/list.h> | 48 | #include <linux/list.h> |
| 49 | #include <linux/skbuff.h> | 49 | #include <linux/skbuff.h> |
| 50 | #include <linux/workqueue.h> | 50 | #include <linux/workqueue.h> |
| 51 | #include <asm/semaphore.h> | ||
| 52 | 51 | ||
| 53 | #define KCI_CONTRUP 0 /* arg: struct capi_profile */ | 52 | #define KCI_CONTRUP 0 /* arg: struct capi_profile */ |
| 54 | #define KCI_CONTRDOWN 1 /* arg: NULL */ | 53 | #define KCI_CONTRDOWN 1 /* arg: NULL */ |