Ignore:
Timestamp:
Dec 24, 2007, 9:21:51 PM (18 years ago)
Author:
Brendan Oakley
Message:

Merge latest trunk development to alsa-resync branch

File:
1 edited

Legend:

Unmodified
Added
Removed

  • GPL/branches/alsa-resync1/alsa-kernel/pci/intel8x0.c

    r277 r278  
    26592659    iputbyte(chip, port + ICH_REG_OFF_CR, ICH_RESETREGS);
    26602660    spin_unlock_irq(&chip->reg_lock);
    2661 #if 0
     2661
    26622662    t = stop_time.tv_sec - start_time.tv_sec;
    26632663    t *= 1000000;
    26642664    t += stop_time.tv_usec - start_time.tv_usec;
    2665 #else
    2666     t = 50000; /* patch, suggested by r.ihle */
    2667 #endif
    26682665    printk(KERN_INFO "%s: measured %lu usecs\n", __FUNCTION__, t);
    26692666    if (t == 0) {
Note: See TracChangeset for help on using the changeset viewer.