#ifndef __SOUND_WTM_H #define __SOUND_WTM_H /* ID */ #define WTM_DEVICE_DESC "{EGO SYS INC,WaveTerminal 192M}," #define VT1724_SUBDEVICE_WTM 0x36495345 /* WT192M ver1.0 */ /* *chip addresses on I2C bus */ #define AK4114_ADDR 0x20 /*S/PDIF receiver*/ #define STAC9460_I2C_ADDR 0x54 /* ADC*2 | DAC*6 */ #define STAC9460_2_I2C_ADDR 0x56 /* ADC|DAC *2 */ extern struct snd_ice1712_card_info snd_vt1724_wtm_cards[]; #endif /* __SOUND_WTM_H */ git' title='net-next.git Git repository'/>
summaryrefslogtreecommitdiff
path: root/net/sched/sch_prio.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2017-02-07 16:29:30 -0500
committerDavid S. Miller <davem@davemloft.net>2017-02-07 16:29:30 -0500
commit3efa70d78f218e4c9276b0bac0545e5184c1c47b (patch)
treef4abe2f05e173023d2a262afd4aebb1e89fe6985 /net/sched/sch_prio.c
parent76e0e70e6452b971a69cc9794ff4a6715c11f7f2 (diff)
parent926af6273fc683cd98cd0ce7bf0d04a02eed6742 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The conflict was an interaction between a bug fix in the netvsc driver in 'net' and an optimization of the RX path in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/sch_prio.c')