diff --git a/[refs] b/[refs] index 3fb5be7de1d6..898e2c415b89 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: df7e3fdf83699328d1fdf7000ce0dc852fbb0ad9 +refs/heads/master: 7f70f046af855e027f7b53ec7d214c2d0c790b6d diff --git a/trunk/sound/pci/ice1712/ice1724.c b/trunk/sound/pci/ice1712/ice1724.c index 681fbbd8a5ce..67350901772c 100644 --- a/trunk/sound/pci/ice1712/ice1724.c +++ b/trunk/sound/pci/ice1712/ice1724.c @@ -2443,12 +2443,10 @@ static int __devinit snd_vt1724_probe(struct pci_dev *pci, outb(inb(ICEREG1724(ice, IRQMASK)) & ~(VT1724_IRQ_MPU_RX | VT1724_IRQ_MPU_TX), ICEREG1724(ice, IRQMASK)); -#if 0 /* for testing */ /* set watermarks */ outb(VT1724_MPU_RX_FIFO | 0x1, ICEREG1724(ice, MPU_FIFO_WM)); outb(0x1, ICEREG1724(ice, MPU_FIFO_WM)); -#endif } }