diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-09-15 09:08:05 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-09-15 09:08:18 -0400 |
| commit | e060c38434b2caa78efe7cedaff4191040b65a15 (patch) | |
| tree | 407361230bf6733f63d8e788e4b5e6566ee04818 /include/linux/sonet.h | |
| parent | 10e4ac572eeffe5317019bd7330b6058a400dfc2 (diff) | |
| parent | cc39c6a9bbdebfcf1a7dee64d83bf302bc38d941 (diff) | |
Merge branch 'master' into for-next
Fast-forward merge with Linus to be able to merge patches
based on more recent version of the tree.
Diffstat (limited to 'include/linux/sonet.h')
| -rw-r--r-- | include/linux/sonet.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/sonet.h b/include/linux/sonet.h index 67ad11fcf88b..de8832dd272b 100644 --- a/include/linux/sonet.h +++ b/include/linux/sonet.h | |||
| @@ -58,7 +58,7 @@ struct sonet_stats { | |||
| 58 | 58 | ||
| 59 | #ifdef __KERNEL__ | 59 | #ifdef __KERNEL__ |
| 60 | 60 | ||
| 61 | #include <asm/atomic.h> | 61 | #include <linux/atomic.h> |
| 62 | 62 | ||
| 63 | struct k_sonet_stats { | 63 | struct k_sonet_stats { |
| 64 | #define __HANDLE_ITEM(i) atomic_t i | 64 | #define __HANDLE_ITEM(i) atomic_t i |