diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-08-08 14:56:19 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-08-08 14:56:19 +0900 |
| commit | 18d4ed4342c14ebeebe60d267b171053efcdfa87 (patch) | |
| tree | f315e77f66cbb70869e2f80cde5c18380a80901e /lib/dec_and_lock.c | |
| parent | 722d0daf2b607a32dad1357bf797e3803484af0a (diff) | |
| parent | 22de4534ae12d61257fc0e53d2571686b03305bc (diff) | |
Merge branch 'for-3.1' into for-3.2
Conflict due to the fix for the register map failure - taken the for-3.1
version.
Conflicts:
sound/soc/codecs/sgtl5000.c
Diffstat (limited to 'lib/dec_and_lock.c')
| -rw-r--r-- | lib/dec_and_lock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/dec_and_lock.c b/lib/dec_and_lock.c index e73822aa6e9a..b5257725daad 100644 --- a/lib/dec_and_lock.c +++ b/lib/dec_and_lock.c @@ -1,6 +1,6 @@ #include <linux/module.h> #include <linux/spinlock.h> -#include <asm/atomic.h> +#include <linux/atomic.h> /* * This is an implementation of the notion of "decrement a |