diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-23 16:16:56 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-23 16:16:56 (GMT) |
commit | 5a439c565799cb8d290d71ce375e86be64d43a4b (patch) | |
tree | b7933dced01add02249af35f5497e77cd11dbfdf /arch/xtensa/platforms/iss | |
parent | 94b6da5ab8293b04a300ba35c72eddfa94db8b02 (diff) | |
parent | 0025427eee4b5c005b4ac7a6489adc773e38611d (diff) | |
download | linux-fsl-qoriq-5a439c565799cb8d290d71ce375e86be64d43a4b.tar.xz |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6:
xtensa: Add config files for Diamond 232L - Rev B processor variant
xtensa: Fix io regions
xtensa: Add support for the Sonic Ethernet device for the XT2000 board.
xtensa: replace remaining __FUNCTION__ occurrences
xtensa: use newer __SPIN_LOCK_UNLOCKED macro
XTENSA: warn about including <asm/rwsem.h> directly.
Diffstat (limited to 'arch/xtensa/platforms/iss')
-rw-r--r-- | arch/xtensa/platforms/iss/network.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/xtensa/platforms/iss/network.c b/arch/xtensa/platforms/iss/network.c index a2e2522..11a20ad 100644 --- a/arch/xtensa/platforms/iss/network.c +++ b/arch/xtensa/platforms/iss/network.c @@ -640,7 +640,7 @@ static int iss_net_configure(int index, char *init) *lp = ((struct iss_net_private) { .device_list = LIST_HEAD_INIT(lp->device_list), .opened_list = LIST_HEAD_INIT(lp->opened_list), - .lock = SPIN_LOCK_UNLOCKED, + .lock = __SPIN_LOCK_UNLOCKED(lp.lock), .dev = dev, .index = index, //.fd = -1, |