diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-08-08 14:30:29 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-08-08 14:30:29 +0200 |
| commit | 0a2d31b62dba9b5b92a38c67c9cc42630513662a (patch) | |
| tree | f755d74ec85248de645e10c45ed1a2ed467530f6 /include/rxrpc/types.h | |
| parent | 8039290a91c5dc4414093c086987a5d7738fe2fd (diff) | |
| parent | df944f66784e6d4f2f50739263a4947885d8b6ae (diff) | |
Merge branch 'fix/kconfig' into for-linus
Diffstat (limited to 'include/rxrpc/types.h')
| -rw-r--r-- | include/rxrpc/types.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/rxrpc/types.h b/include/rxrpc/types.h index 327a5fc4719c..30d48f6da228 100644 --- a/include/rxrpc/types.h +++ b/include/rxrpc/types.h @@ -17,7 +17,7 @@ #include <linux/socket.h> #include <linux/in.h> #include <linux/spinlock.h> -#include <asm/atomic.h> +#include <linux/atomic.h> typedef uint32_t rxrpc_seq_t; /* Rx message sequence number */ typedef uint32_t rxrpc_serial_t; /* Rx message serial number */ |