This is a collection of the patches I had to make to get 2.4.0-t3p2 to
compile. Mostly unused variables, plus incorrect tuner initialization in
videodev.c and a symbol conflict in 8390.c.
Some of my changes are quite obvious, but the rest should be seen as a
hint to the maintainers where the problem is, because I'm not familiar
with the drivers I changed.
Arnd <><
--- linux/net/netsyms.c.warn Mon Jul 3 18:49:10 2000
+++ linux/net/netsyms.c Tue Jul 4 02:44:22 2000
@@ -436,6 +436,7 @@
#endif /* CONFIG_INET */
+#if 0
#if defined(CONFIG_ULTRA) || defined(CONFIG_WD80x3) || \
defined(CONFIG_EL2) || defined(CONFIG_NE2000) || \
defined(CONFIG_E2100) || defined(CONFIG_HPLAN_PLUS) || \
@@ -450,6 +451,7 @@
EXPORT_SYMBOL(ei_interrupt);
EXPORT_SYMBOL(ethdev_init);
EXPORT_SYMBOL(NS8390_init);
+#endif
#endif
#ifdef CONFIG_TR
--- linux/drivers/char/videodev.c.warn Mon Jul 3 15:56:48 2000
+++ linux/drivers/char/videodev.c Tue Jul 4 02:44:22 2000
@@ -61,9 +61,6 @@
#endif /* CONFIG_PROC_FS && CONFIG_VIDEO_PROC_FS */
-#ifdef CONFIG_VIDEO_BT848
-extern int i2c_tuner_init(struct video_init *);
-#endif
#ifdef CONFIG_VIDEO_BWQCAM
extern int init_bw_qcams(struct video_init *);
#endif
@@ -78,9 +75,6 @@
#endif
static struct video_init video_init_list[]={
-#ifdef CONFIG_VIDEO_BT848
- {"i2c-tuner", i2c_tuner_init},
-#endif
#ifdef CONFIG_VIDEO_BWQCAM
{"bw-qcam", init_bw_qcams},
#endif
@@ -330,6 +324,8 @@
video_dev_proc_entry->owner = THIS_MODULE;
}
+#ifdef MODULE
+
static void videodev_proc_destroy(void)
{
if (video_dev_proc_entry != NULL)
@@ -338,6 +334,8 @@
if (video_proc_entry != NULL)
remove_proc_entry("video", &proc_root);
}
+
+#endif /* MODULE */
static void videodev_proc_create_dev (struct video_device *vfd, char *name)
{
--- linux/drivers/char/msp3400.c.warn Mon Jul 3 16:01:34 2000
+++ linux/drivers/char/msp3400.c Tue Jul 4 02:44:22 2000
@@ -85,7 +85,9 @@
the autoscan seems work well only with FM... */
static int simple = -1; /* use short programming (>= msp3410 only) */
static int dolby = 0;
+#ifdef REGISTER_MIXER
static int mixer = -1;
+#endif
struct msp3400c {
int simple;
@@ -128,7 +130,10 @@
MODULE_PARM(simple,"i");
MODULE_PARM(amsound,"i");
MODULE_PARM(dolby,"i");
+
+#ifdef REGISTER_MIXER
MODULE_PARM(mixer,"i");
+#endif
/* ---------------------------------------------------------------------- */
--- linux/drivers/sound/sb_common.c.warn Mon Jul 3 16:13:34 2000
+++ linux/drivers/sound/sb_common.c Tue Jul 4 02:44:22 2000
@@ -28,7 +28,6 @@
#include "sound_config.h"
#include "sound_firmware.h"
-#include "soundmodule.h"
#include "mpu401.h"
--- linux/drivers/sound/ad1848.c.warn Tue Jul 4 01:26:48 2000
+++ linux/drivers/sound/ad1848.c Tue Jul 4 02:44:22 2000
@@ -39,11 +39,10 @@
#include <linux/stddef.h>
#include <linux/pm.h>
-#include "soundmodule.h"
-
#define DEB(x)
#define DEB1(x)
#include "sound_config.h"
+#include "soundmodule.h"
#include "ad1848.h"
#include "ad1848_mixer.h"
--- linux/drivers/sound/ad1816.c.warn Tue Jul 4 01:26:48 2000
+++ linux/drivers/sound/ad1816.c Tue Jul 4 02:48:58 2000
@@ -36,8 +36,8 @@
#include <linux/isapnp.h>
#include <linux/stddef.h>
-#include "soundmodule.h"
#include "sound_config.h"
+#include "soundmodule.h"
#define DEBUGNOISE(x)
#define DEBUGINFO(x)
--- linux/drivers/sound/waveartist.c.warn Tue Jul 4 01:26:48 2000
+++ linux/drivers/sound/waveartist.c Tue Jul 4 02:44:22 2000
@@ -42,8 +42,8 @@
#include <asm/hardware.h>
#include <asm/system.h>
-#include "soundmodule.h"
#include "sound_config.h"
+#include "soundmodule.h"
#include "waveartist.h"
#ifndef _ISA_DMA
--- linux/drivers/sound/soundmodule.h.warn Tue Jul 4 01:26:48 2000
+++ linux/drivers/sound/soundmodule.h Tue Jul 4 02:44:22 2000
@@ -4,9 +4,6 @@
#include <linux/notifier.h>
#include <linux/module.h>
-extern struct notifier_block *sound_locker;
-extern void sound_notifier_chain_register(struct notifier_block *);
-
#define SOUND_LOCK sound_notifier_chain_register(&sound_notifier);
#define SOUND_LOCK_END notifier_chain_unregister(&sound_locker, &sound_notifier)
--- linux/drivers/sound/sound_syms.c.warn Tue Jul 4 01:26:48 2000
+++ linux/drivers/sound/sound_syms.c Tue Jul 4 02:44:22 2000
@@ -53,7 +53,6 @@
EXPORT_SYMBOL(softoss_dev);
/* Locking */
-#include "soundmodule.h"
EXPORT_SYMBOL(sound_locker);
EXPORT_SYMBOL(sound_notifier_chain_register);
--- linux/drivers/sound/sound_calls.h.warn Tue Jul 4 01:26:48 2000
+++ linux/drivers/sound/sound_calls.h Tue Jul 4 02:44:22 2000
@@ -82,6 +82,8 @@
void sound_stop_timer(void);
void conf_printf(char *name, struct address_info *hw_config);
void conf_printf2(char *name, int base, int irq, int dma, int dma2);
+extern struct notifier_block *sound_locker;
+extern void sound_notifier_chain_register(struct notifier_block *);
/* From sound_timer.c */
void sound_timer_interrupt(void);
--- linux/drivers/sound/soundcard.c.warn Tue Jul 4 01:35:50 2000
+++ linux/drivers/sound/soundcard.c Tue Jul 4 02:44:22 2000
@@ -43,8 +43,8 @@
#include <linux/delay.h>
#include <linux/proc_fs.h>
#include <linux/smp_lock.h>
-#include "soundmodule.h"
-
+#include <linux/notifier.h>
+#include <linux/module.h>
struct notifier_block *sound_locker=(struct notifier_block *)0;
static int lock_depth = 0;
--- linux/drivers/video/atyfb.c.warn Mon Jul 3 16:43:35 2000
+++ linux/drivers/video/atyfb.c Tue Jul 4 02:44:22 2000
@@ -612,6 +612,7 @@
writeb (val, info->ati_regbase + regindex);
}
+#ifdef CONFIG_PPC
static void aty_st_lcd(int index, u32 val, const struct fb_info_aty *info)
{
unsigned long temp;
@@ -633,6 +634,7 @@
/* read the register value */
return aty_ld_le32(LCD_DATA, info);
}
+#endif
/*
* Generic Mach64 routines
--- linux/drivers/video/fbcon.c.warn Tue Jul 4 01:40:41 2000
+++ linux/drivers/video/fbcon.c Tue Jul 4 02:44:22 2000
@@ -2039,11 +2039,20 @@
{
struct display *p = &fb_display[fg_console]; /* draw to vt in foreground */
int depth = p->var.bits_per_pixel;
+#if defined(CONFIG_FBCON_CFB4) || defined(CONFIG_FBCON_CFB8) || \
+ defined(CONFIG_FBCON_CFB16) || defined(CONFIG_FBCON_CFB24) || \
+ defined(CONFIG_FBCON_CFB32) || defined(CONFIG_FB_SBUS) || \
+ defined(CONFIG_FBCON_IPLAN2P2) || defined(CONFIG_FBCON_IPLAN2P4) || \
+ defined(CONFIG_FBCON_IPLAN2P8) || defined(CONFIG_FBCON_MFB) || \
+ defined(CONFIG_FBCON_AFB) || defined(CONFIG_FBCON_ILBM) || \
+ defined(CONFIG_FBCON_HGA) || defined(CONFIG_FBCON_VGA_PLANES)
int line = p->next_line;
+ unsigned char *dst, *src;
+ int x1,y1;
+#endif
unsigned char *fb = p->screen_base;
unsigned char *logo;
- unsigned char *dst, *src;
- int i, j, n, x1, y1, x;
+ int i, j, n, x;
int logo_depth, done = 0;
/* Return if the frame buffer is not mapped */
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Fri Jul 07 2000 - 21:00:14 EST