summaryrefslogtreecommitdiff
path: root/include/linux/compat.h
diff options
context:
space:
mode:
authorAlbert ARIBAUD <[email protected]>2015-02-24 07:59:38 +0100
committerAlbert ARIBAUD <[email protected]>2015-02-24 07:59:38 +0100
commite1cc4d31f889428a4ca73120951389c756404184 (patch)
tree4a2028c750e19f5d36d0aa7545bda7cbacea9dd4 /include/linux/compat.h
parent23d184d2fbc805bdd9fb41f2370cdce04a7894af (diff)
parent38dac81b3d0e777f301ca98100bfbcab01d616c2 (diff)
Merge remote-tracking branch 'u-boot/master' into 'u-boot-arm/master'
Diffstat (limited to 'include/linux/compat.h')
-rw-r--r--include/linux/compat.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/compat.h b/include/linux/compat.h
index b40133cb3cd..6eac17f0b64 100644
--- a/include/linux/compat.h
+++ b/include/linux/compat.h
@@ -262,7 +262,6 @@ typedef struct {
/* from include/linux/types.h */
-typedef int atomic_t;
/**
* struct callback_head - callback structure for use with RCU and task_work
* @next: next update requests in a list