diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-07-05 11:54:27 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-07-05 11:54:27 +0200 |
| commit | 38f0ad7c90c2b2091e7d8689dde294fef27db68b (patch) | |
| tree | 17742c032f74a953054a99ebc04ee6cd7ead2d9d /include/uapi/linux | |
| parent | 8f0b3b7e222383a21f7d58bd97d5552b3a5dbced (diff) | |
| parent | 70a9f8797ce298544cfd07328ff59f00488bc491 (diff) | |
Merge tag 'asoc-v3.11-4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Updates for v3.11
A few small fixes, all driver specific. The removal of the GPIO based
pinmuxing is a bug fix, since the obsolete nodes had been removed from
the DT it stopped the driver loading.
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/Kbuild | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild index ab5d4992e568..bdc6e87ff3eb 100644 --- a/include/uapi/linux/Kbuild +++ b/include/uapi/linux/Kbuild @@ -261,6 +261,7 @@ header-y += net_dropmon.h header-y += net_tstamp.h header-y += netconf.h header-y += netdevice.h +header-y += netlink_diag.h header-y += netfilter.h header-y += netfilter_arp.h header-y += netfilter_bridge.h |