diff options
| author | David S. Miller <davem@davemloft.net> | 2009-11-19 01:19:03 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-19 01:19:03 -0500 |
| commit | 3505d1a9fd65e2d3e00827857b6795d9d8983658 (patch) | |
| tree | 941cfafdb57c427bb6b7ebf6354ee93b2a3693b5 /arch/sh/include | |
| parent | dfef948ed2ba69cf041840b5e860d6b4e16fa0b1 (diff) | |
| parent | 66b00a7c93ec782d118d2c03bd599cfd041e80a1 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/sfc/sfe4001.c
drivers/net/wireless/libertas/cmd.c
drivers/staging/Kconfig
drivers/staging/Makefile
drivers/staging/rtl8187se/Kconfig
drivers/staging/rtl8192e/Kconfig
Diffstat (limited to 'arch/sh/include')
| -rw-r--r-- | arch/sh/include/asm/rwsem.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/include/asm/rwsem.h b/arch/sh/include/asm/rwsem.h index 1987f3ea7f1..06e2251a5e4 100644 --- a/arch/sh/include/asm/rwsem.h +++ b/arch/sh/include/asm/rwsem.h | |||
| @@ -41,7 +41,7 @@ struct rw_semaphore { | |||
| 41 | #endif | 41 | #endif |
| 42 | 42 | ||
| 43 | #define __RWSEM_INITIALIZER(name) \ | 43 | #define __RWSEM_INITIALIZER(name) \ |
| 44 | { RWSEM_UNLOCKED_VALUE, SPIN_LOCK_UNLOCKED, \ | 44 | { RWSEM_UNLOCKED_VALUE, __SPIN_LOCK_UNLOCKED((name).wait_lock), \ |
| 45 | LIST_HEAD_INIT((name).wait_list) \ | 45 | LIST_HEAD_INIT((name).wait_list) \ |
| 46 | __RWSEM_DEP_MAP_INIT(name) } | 46 | __RWSEM_DEP_MAP_INIT(name) } |
| 47 | 47 | ||