Changeset 97c7682 in mainline for uspace/drv/bus/usb/ehci/res.c


Ignore:
Timestamp:
2012-07-14T11:18:40Z (12 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
804d9b6
Parents:
0747468 (diff), f0348c8 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge mainline changes.

Text conflict in boot/arch/arm32/Makefile.inc:

Trivial conflict around ifeq condition.

Text conflict in kernel/arch/arm32/include/mm/page.h:

Added defines and set_pt_levelx_present function.
COnflict looked horrible because of the armv4/v7 split.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/drv/bus/usb/ehci/res.c

    r0747468 r97c7682  
    109109        return EOK;
    110110}
    111 /*----------------------------------------------------------------------------*/
     111
    112112/** Calls the PCI driver with a request to enable interrupts
    113113 *
    … …  
    127127        return enabled ? EOK : EIO;
    128128}
    129 /*----------------------------------------------------------------------------*/
     129
    130130/** Implements BIOS hands-off routine as described in EHCI spec
    131131 *
Note: See TracChangeset for help on using the changeset viewer.