diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-01-06 10:24:07 +0100 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-01-06 10:24:07 +0100 |
| commit | f862f904d357dc0d3612347a8dbabe6fae037fbb (patch) | |
| tree | d7f5c2d5f85fd9e1cfc36beae904dc4f9cca04a3 /drivers/net/benet/be.h | |
| parent | sh: include Migo-R TS driver in Migo-R defconfig (diff) | |
| parent | Linux 2.6.37 (diff) | |
| download | linux-f862f904d357dc0d3612347a8dbabe6fae037fbb.tar.xz linux-f862f904d357dc0d3612347a8dbabe6fae037fbb.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-latest
Conflicts:
arch/sh/kernel/cpu/sh2a/clock-sh7201.c
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/net/benet/be.h')
| -rw-r--r-- | drivers/net/benet/be.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/benet/be.h b/drivers/net/benet/be.h index 4594a28b1f66..d64313b7090e 100644 --- a/drivers/net/benet/be.h +++ b/drivers/net/benet/be.h @@ -234,7 +234,7 @@ struct be_adapter { u8 __iomem *db; /* Door Bell */ u8 __iomem *pcicfg; /* PCI config space */ - spinlock_t mbox_lock; /* For serializing mbox cmds to BE card */ + struct mutex mbox_lock; /* For serializing mbox cmds to BE card */ struct be_dma_mem mbox_mem; /* Mbox mem is adjusted to align to 16 bytes. The allocated addr * is stored for freeing purpose */ |