diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-03-13 12:53:25 +0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-03-13 12:53:25 +0400 |
| commit | 5fdb83f190ee2218d113a46b190b70aa1c979325 (patch) | |
| tree | fbb95a73b111c2e4d0320393754c11a9ec026b39 /drivers/net/bonding/bond_options.c | |
| parent | 4c16ecc4c0715e0b6b3c7b72976c05b0e212cd0f (diff) | |
| parent | deeed33850c8a376addabbf971df433b2a1ba74c (diff) | |
| download | linux-5fdb83f190ee2218d113a46b190b70aa1c979325.tar.xz | |
Merge tag 'asoc-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: Updates for v3.15
Quite a busy release for ASoC this time, more on janitorial work than
exciting new features but welcome nontheless:
- Lots of cleanups from Takashi for enumerations; the original API for
these was error prone so he's refactored lots of code to use more
modern APIs which avoid issues.
- Elimination of the ASoC level wrappers for I2C and SPI moving us
closer to converting to regmap completely and avoiding some
randconfig hassle.
- Provide both manually and transparently locked DAPM APIs rather than
a mix of the two fixing some concurrency issues.
- Start converting CODEC drivers to use separate bus interface drivers
rather than having them all in one file helping avoid dependency
issues.
- DPCM support for Intel Haswell and Bay Trail platforms.
- Lots of work on improvements for simple-card, DaVinci and the Renesas
rcar drivers.
- New drivers for Analog Devices ADAU1977, TI PCM512x and parts of the
CSR SiRF SoC.
Diffstat (limited to 'drivers/net/bonding/bond_options.c')
| -rw-r--r-- | drivers/net/bonding/bond_options.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/bonding/bond_options.c b/drivers/net/bonding/bond_options.c index 11cb943222d5..c37878432717 100644 --- a/drivers/net/bonding/bond_options.c +++ b/drivers/net/bonding/bond_options.c @@ -14,7 +14,7 @@ #include <linux/errno.h> #include <linux/if.h> #include <linux/netdevice.h> -#include <linux/rwlock.h> +#include <linux/spinlock.h> #include <linux/rcupdate.h> #include <linux/ctype.h> #include <linux/inet.h> |