The patch titled
fix sgivwfb compile
has been added to the -mm tree. Its filename is
fix-sgivwfb-compile.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: fix sgivwfb compile
From: Adrian Bunk <bunk@xxxxxxxxx>
drivers/built-in.o: In function `sgivwfb_set_par':
sgivwfb.c:(.text+0x88583): undefined reference to `sgivwfb_mem_phys'
sgivwfb.c:(.text+0x88596): undefined reference to `sgivwfb_mem_phys'
sgivwfb.c:(.text+0x885a8): undefined reference to `sgivwfb_mem_phys'
drivers/built-in.o: In function `sgivwfb_check_var':
sgivwfb.c:(.text+0x88ad0): undefined reference to `sgivwfb_mem_size'
drivers/built-in.o: In function `sgivwfb_mmap':
sgivwfb.c:(.text+0x88c75): undefined reference to `sgivwfb_mem_size'
sgivwfb.c:(.text+0x88c7f): undefined reference to `sgivwfb_mem_phys'
drivers/built-in.o: In function `sgivwfb_probe':
sgivwfb.c:(.init.text+0x4060): undefined reference to `sgivwfb_mem_size'
sgivwfb.c:(.init.text+0x4065): undefined reference to `sgivwfb_mem_phys'
sgivwfb.c:(.init.text+0x4076): undefined reference to `sgivwfb_mem_phys'
sgivwfb.c:(.init.text+0x409c): undefined reference to `sgivwfb_mem_size'
sgivwfb.c:(.init.text+0x410e): undefined reference to `sgivwfb_mem_size'
sgivwfb.c:(.init.text+0x4113): undefined reference to `sgivwfb_mem_phys'
sgivwfb.c:(.init.text+0x4162): undefined reference to `sgivwfb_mem_size'
sgivwfb.c:(.init.text+0x4168): undefined reference to `sgivwfb_mem_phys'
make: *** [.tmp_vmlinux1] Error 1
Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/i386/mach-visws/setup.c | 4 ++--
drivers/video/sgivwfb.c | 6 ++----
include/asm-i386/mach-visws/setup_arch.h | 3 +++
3 files changed, 7 insertions(+), 6 deletions(-)
diff -puN arch/i386/mach-visws/setup.c~fix-sgivwfb-compile arch/i386/mach-visws/setup.c
--- a/arch/i386/mach-visws/setup.c~fix-sgivwfb-compile
+++ a/arch/i386/mach-visws/setup.c
@@ -140,8 +140,8 @@ void __init time_init_hook(void)
#define MB (1024 * 1024)
-static unsigned long sgivwfb_mem_phys;
-static unsigned long sgivwfb_mem_size;
+unsigned long sgivwfb_mem_phys;
+unsigned long sgivwfb_mem_size;
long long mem_size __initdata = 0;
diff -puN drivers/video/sgivwfb.c~fix-sgivwfb-compile drivers/video/sgivwfb.c
--- a/drivers/video/sgivwfb.c~fix-sgivwfb-compile
+++ a/drivers/video/sgivwfb.c
@@ -23,6 +23,8 @@
#include <asm/io.h>
#include <asm/mtrr.h>
+#include <setup_arch.h>
+
#define INCLUDE_TIMING_TABLE_DATA
#define DBE_REG_BASE par->regs
#include <video/sgivw.h>
@@ -42,10 +44,6 @@ struct sgivw_par {
* The default can be overridden if the driver is compiled as a module
*/
-/* set by arch/i386/kernel/setup.c */
-extern unsigned long sgivwfb_mem_phys;
-extern unsigned long sgivwfb_mem_size;
-
static int ypan = 0;
static int ywrap = 0;
diff -puN include/asm-i386/mach-visws/setup_arch.h~fix-sgivwfb-compile include/asm-i386/mach-visws/setup_arch.h
--- a/include/asm-i386/mach-visws/setup_arch.h~fix-sgivwfb-compile
+++ a/include/asm-i386/mach-visws/setup_arch.h
@@ -1,5 +1,8 @@
/* Hook to call BIOS initialisation function */
+extern unsigned long sgivwfb_mem_phys;
+extern unsigned long sgivwfb_mem_size;
+
/* no action for visws */
#define ARCH_SETUP
_
Patches currently in -mm which might be from bunk@xxxxxxxxx are
origin.patch
git-acpi.patch
drivers-acpi-scanc-make-acpi_bus_type-static.patch
git-agpgart.patch
the-scheduled-unexport-of-insert_resource.patch
git-gfs2.patch
make-variables-static-after-klibc-merge.patch
git-libata-all.patch
ni5010-netcard-cleanup-fix.patch
git-ocfs2.patch
gregkh-pci-acpiphp-configure-_prt-v3-cleanup.patch
drivers-scsi-aic7xxx-possible-cleanups.patch
drivers-scsi-small-cleanups.patch
drivers-scsi-megaraidc-add-a-dummy-mega_create_proc_entry-for-proc_fs=y.patch
drivers-scsi-qla2xxx-make-some-functions-static.patch
drivers-scsi-qla2xxx-make-more-some-functions-static.patch
drivers-scsi-aic7xxx-aic79xx_corec-make-ahd_done_with_status-static.patch
drivers-scsi-aic7xxx-aic79xx_corec-make-ahd_match_scb-static.patch
drivers-scsi-aic7xxx-possible-cleanups-2.patch
drivers-scsi-arcmsr-cleanups.patch
drivers-scsi-advansysc-cleanups.patch
if-0-drivers-usb-input-hid-corechid_find_field_by_usage.patch
acx1xx-wireless-driver.patch
make-kernel-sysctlc_proc_do_string-static.patch
namespaces-utsname-implement-clone_newuts-flag-tidy.patch
task-watchers-register-semundo-task-watcher-cleanup.patch
fs-reiser4-possible-cleanups.patch
drivers-ide-legacy-ide-csc-make-2-functions-static.patch
drivers-md-raid5c-remove-an-unused-variable.patch
slab-cache-shrinker-statistics.patch
i386-enable-4k-stacks-by-default.patch
mutex-subsystem-synchro-test-module.patch
fix-sgivwfb-compile.patch
arch-i386-mach-visws-setupc-remove-dummy-function-calls.patch
make-drivers-scsi-aic7xxx-aic79xx_coreahd_set_tags-static.patch
kernel-rcutorturec-make-code-static.patch
drivers-dma-iovlockc-make-num_pages_spanned-static.patch
drivers-net-irda-mcs7780c-make-struct-mcs_driver-static.patch
fs-jffs2-make-2-functions-static.patch
kernel-lockdepc-possible-cleanups.patch
fs-ecryptfs-possible-cleanups.patch
re-add-config_sound_sscape.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
