merge mainline into sgi

This commit is contained in:
Vladimir 'phcoder' Serbinenko committed 2011-05-15 02:23:36 +02:00
commit bee1aeb9a1
49 files changed
+1148 -348

No files matched your search

+1 -1
View File
@@ -134,7 +134,7 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/extcmd.h
KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/arc/arc.h
endif
if COND_mips_yeeloong
if COND_mips_loongson
KERNEL_HEADER_FILES += $(top_builddir)/include/grub/keyboard_layouts.h
KERNEL_HEADER_FILES += $(top_builddir)/include/grub/cpu/cache.h
KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/bitmap.h