diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-04-07 06:28:00 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-04-07 06:28:00 -0400 |
| commit | c38f62b08d800104fa9b0e9d6e9141459986c06d (patch) | |
| tree | 1d04d768c8aa0c1a544d1f068317c7beb0101be2 /net/lapb/lapb_in.c | |
| parent | 250f32747e62cb415b85083e247184188f24e566 (diff) | |
| parent | 8abe05c6eb358967f16bce8a02c88d57c82cfbd6 (diff) | |
Merge tag 'asoc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: fixes for 3.4
A bunch of driver-specific fixes and one generic fix for the new support
for platform DAPM contexts - we were picking the wrong default for the
idle_bias_off setting which was meaning we weren't actually achieving
any useful runtime PM on platform devices.
Diffstat (limited to 'net/lapb/lapb_in.c')
| -rw-r--r-- | net/lapb/lapb_in.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/lapb/lapb_in.c b/net/lapb/lapb_in.c index 2ec1af5c36cc..f4e3c1accab7 100644 --- a/net/lapb/lapb_in.c +++ b/net/lapb/lapb_in.c | |||
| @@ -30,7 +30,6 @@ | |||
| 30 | #include <linux/slab.h> | 30 | #include <linux/slab.h> |
| 31 | #include <net/sock.h> | 31 | #include <net/sock.h> |
| 32 | #include <asm/uaccess.h> | 32 | #include <asm/uaccess.h> |
| 33 | #include <asm/system.h> | ||
| 34 | #include <linux/fcntl.h> | 33 | #include <linux/fcntl.h> |
| 35 | #include <linux/mm.h> | 34 | #include <linux/mm.h> |
| 36 | #include <linux/interrupt.h> | 35 | #include <linux/interrupt.h> |