Changeset db6e419 in mainline for kernel/arch/arm32/include/mm/page.h


Ignore:
Timestamp:
2011-08-16T18:53:00Z (13 years ago)
Author:
Petr Koupy <petr.koupy@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
49160c4
Parents:
e0e922d (diff), 45058baa (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.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • kernel/arch/arm32/include/mm/page.h

    re0e922d rdb6e419  
    5252#       define PA2KA(x) ((x) + 0x80000000)
    5353#endif
    54 
    55 #ifdef KERNEL
    5654
    5755/* Number of entries in each level. */
    … …  
    320318#endif /* __ASM__ */
    321319
    322 #endif /* KERNEL */
    323 
    324320#endif
    325321
Note: See TracChangeset for help on using the changeset viewer.