Merge branch 'x86-platform-for-linus' of...
Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: Introduce pci_map_biosrom() x86, olpc: Use device tree for platform identification
Showing
- arch/x86/Kconfig 1 addition, 1 deletionarch/x86/Kconfig
- arch/x86/include/asm/olpc_ofw.h 3 additions, 6 deletionsarch/x86/include/asm/olpc_ofw.h
- arch/x86/include/asm/probe_roms.h 8 additions, 0 deletionsarch/x86/include/asm/probe_roms.h
- arch/x86/include/asm/setup.h 1 addition, 1 deletionarch/x86/include/asm/setup.h
- arch/x86/kernel/Makefile 1 addition, 1 deletionarch/x86/kernel/Makefile
- arch/x86/kernel/head32.c 0 additions, 1 deletionarch/x86/kernel/head32.c
- arch/x86/kernel/probe_roms.c 101 additions, 0 deletionsarch/x86/kernel/probe_roms.c
- arch/x86/kernel/x86_init.c 1 addition, 1 deletionarch/x86/kernel/x86_init.c
- arch/x86/platform/olpc/Makefile 1 addition, 3 deletionsarch/x86/platform/olpc/Makefile
- arch/x86/platform/olpc/olpc.c 27 additions, 24 deletionsarch/x86/platform/olpc/olpc.c
- arch/x86/platform/olpc/olpc_dt.c 19 additions, 0 deletionsarch/x86/platform/olpc/olpc_dt.c
Loading
Please register or sign in to comment