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/lib/drv/include/ddf/interrupt.h

    r0747468 r97c7682  
    3636#define DDF_INTERRUPT_H_
    3737
     38#include <libarch/common.h>
     39#include <libarch/types.h>
    3840#include <abi/ddi/irq.h>
    3941#include <adt/list.h>
    4042#include <ddi.h>
    4143#include <fibril_synch.h>
    42 
    4344#include "driver.h"
    4445#include "../dev_iface.h"
Note: See TracChangeset for help on using the changeset viewer.