ChangeSet 1.2065.2.1, 2005/03/12 08:49:12+01:00, [EMAIL PROTECTED]
Merge mars.ravnborg.org:/home/sam/bk/linux-2.6
into mars.ravnborg.org:/home/sam/bk/kbuild
Makefile | 2 +-
arch/i386/Makefile | 5 ++++-
drivers/video/console/Makefile | 4 +++-
kernel/Makefile | 2 +-
kernel/kallsyms.c | 4 ++--
5 files changed, 11 insertions(+), 6 deletions(-)
diff -Nru a/Makefile b/Makefile
--- a/Makefile 2005-03-12 21:24:15 -08:00
+++ b/Makefile 2005-03-12 21:24:15 -08:00
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 11
-EXTRAVERSION =-rc2
+EXTRAVERSION =
NAME=Woozy Numbat
# *DOCUMENTATION*
diff -Nru a/arch/i386/Makefile b/arch/i386/Makefile
--- a/arch/i386/Makefile 2005-03-12 21:24:15 -08:00
+++ b/arch/i386/Makefile 2005-03-12 21:24:15 -08:00
@@ -142,7 +142,10 @@
zdisk bzdisk: vmlinux
$(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(KBUILD_IMAGE) zdisk
-install fdimage fdimage144 fdimage288: vmlinux
+fdimage fdimage144 fdimage288: vmlinux
+ $(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(KBUILD_IMAGE) $@
+
+install:
$(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(KBUILD_IMAGE) $@
prepare: include/asm-$(ARCH)/asm_offsets.h
diff -Nru a/drivers/video/console/Makefile b/drivers/video/console/Makefile
--- a/drivers/video/console/Makefile 2005-03-12 21:24:15 -08:00
+++ b/drivers/video/console/Makefile 2005-03-12 21:24:15 -08:00
@@ -25,7 +25,9 @@
obj-$(CONFIG_VGA_CONSOLE) += vgacon.o
obj-$(CONFIG_MDA_CONSOLE) += mdacon.o
obj-$(CONFIG_FRAMEBUFFER_CONSOLE) += fbcon.o bitblit.o font.o
-obj-$(CONFIG_FB_TILEBLITTING) += tileblit.o
+ifeq ($(CONFIG_FB_TILEBLITTING),y)
+obj-$(CONFIG_FRAMEBUFFER_CONSOLE) += tileblit.o
+endif
obj-$(CONFIG_FB_STI) += sticore.o
diff -Nru a/kernel/Makefile b/kernel/Makefile
--- a/kernel/Makefile 2005-03-12 21:24:15 -08:00
+++ b/kernel/Makefile 2005-03-12 21:24:15 -08:00
@@ -47,7 +47,7 @@
$(call if_changed,gzip)
quiet_cmd_ikconfiggz = IKCFG $@
- cmd_ikconfiggz = (echo "const char kernel_config_data[] = MAGIC_START";
cat $< | scripts/bin2c; echo "MAGIC_END;") > $@
+ cmd_ikconfiggz = (echo "static const char kernel_config_data[] =
MAGIC_START"; cat $< | scripts/bin2c; echo "MAGIC_END;") > $@
targets += config_data.h
$(obj)/config_data.h: $(obj)/config_data.gz FORCE
$(call if_changed,ikconfiggz)
diff -Nru a/kernel/kallsyms.c b/kernel/kallsyms.c
--- a/kernel/kallsyms.c 2005-03-12 21:24:15 -08:00
+++ b/kernel/kallsyms.c 2005-03-12 21:24:15 -08:00
@@ -355,7 +355,7 @@
return 0;
}
-struct seq_operations kallsyms_op = {
+static struct seq_operations kallsyms_op = {
.start = s_start,
.next = s_next,
.stop = s_stop,
@@ -397,7 +397,7 @@
.release = kallsyms_release,
};
-int __init kallsyms_init(void)
+static int __init kallsyms_init(void)
{
struct proc_dir_entry *entry;
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
