diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-11 17:53:53 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-11 17:53:53 -0400 |
| commit | 871039f02f8ec4ab2e5e9010718caa8e085786f1 (patch) | |
| tree | f0d2b3127fc48c862967d68c46c2d46668137515 /sound/soc/sh/Kconfig | |
| parent | e4077e018b5ead3de9951fc01d8bf12eeeeeefed (diff) | |
| parent | 4a1032faac94ebbf647460ae3e06fc21146eb280 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/stmmac/stmmac_main.c
drivers/net/wireless/wl12xx/wl1271_cmd.c
drivers/net/wireless/wl12xx/wl1271_main.c
drivers/net/wireless/wl12xx/wl1271_spi.c
net/core/ethtool.c
net/mac80211/scan.c
Diffstat (limited to 'sound/soc/sh/Kconfig')
| -rw-r--r-- | sound/soc/sh/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/sh/Kconfig b/sound/soc/sh/Kconfig index 106674979b53..f07f6d8b93e1 100644 --- a/sound/soc/sh/Kconfig +++ b/sound/soc/sh/Kconfig | |||
| @@ -32,6 +32,7 @@ config SND_SOC_SH4_SIU | |||
| 32 | select DMA_ENGINE | 32 | select DMA_ENGINE |
| 33 | select DMADEVICES | 33 | select DMADEVICES |
| 34 | select SH_DMAE | 34 | select SH_DMAE |
| 35 | select FW_LOADER | ||
| 35 | 36 | ||
| 36 | ## | 37 | ## |
| 37 | ## Boards | 38 | ## Boards |