Tiny unimportant cleanups. Kill warnings, etc.
Changes:
drivers/ieee1394/ohci1394.h: remove PCI id now in include/linux/pci_ids.h
drivers/pci/pci.ids: change '??' that gets interpreted (eventually) by
newer gcc compilers as a trigraph
drivers/pcmcia/bulkmem.c: include proc_fs.h
drivers/pcmcia/rsrc_mgr.c: include proc_fs.h, init var to kill warning
drivers/pcmcia/tcic.c: include proc_fs.h
drivers/sound/Config.in: C-Media PCI audio depends on CONFIG_PCI
drivers/sound/gus_midi.c: use proper include style
drivers/sound/ymfpci.c: init var to NULL to kill warning
drivers/usb/storage/usb.h: mark 'extern', we don't declare it here
drivers/video/sis/sis_301.h: likewise
include/linux/802_11.h: include newline at end of header
include/linux/if_frad.h: mark 'extern', we don't declare it here.
comment out token following #endif.
net/atm/lec.c: mark 'extern', we don't declare it here.
net/ipx/af_ipx.c: put braces around what compiler calls an "ambigiuous if"
diff -u linux_2_4/drivers/ieee1394/ohci1394.h:1.1.1.12
linux_2_4/drivers/ieee1394/ohci1394.h:1.1.1.12.36.1
--- linux_2_4/drivers/ieee1394/ohci1394.h:1.1.1.12 Sun Feb 18 13:46:59 2001
+++ linux_2_4/drivers/ieee1394/ohci1394.h Sun Mar 4 16:39:14 2001
@@ -75,10 +75,6 @@
#define PCI_DEVICE_ID_NEC_UPD72871 0x00ce
#endif
-#ifndef PCI_DEVICE_ID_APPLE_UNI_N_FW
-#define PCI_DEVICE_ID_APPLE_UNI_N_FW 0x0018
-#endif
-
#ifndef PCI_DEVICE_ID_ALI_OHCI1394_M5251
#define PCI_DEVICE_ID_ALI_OHCI1394_M5251 0x5251
#endif
diff -u linux_2_4/drivers/pci/pci.ids:1.1.1.24
linux_2_4/drivers/pci/pci.ids:1.1.1.24.2.1
--- linux_2_4/drivers/pci/pci.ids:1.1.1.24 Sun Mar 4 15:03:29 2001
+++ linux_2_4/drivers/pci/pci.ids Sun Mar 4 16:39:18 2001
@@ -1259,7 +1259,7 @@
109e Brooktree Corporation
0350 Bt848 TV with DMA push
0351 Bt849A Video capture
- 036c Bt879(??) Video Capture
+ 036c Bt879(?) Video Capture
13e9 0070 Win/TV (Video Section)
036e Bt878
0070 13eb WinTV/GO
@@ -3936,7 +3936,7 @@
# 1507 HTEC Ltd
# Commented out because there are no known HTEC chips and 1507 is already
# used by mistake by Motorola (see vendor ID 1057)
-1507 Motorola ?? / HTEC
+1507 Motorola ? / HTEC
0001 MPC105 [Eagle]
0002 MPC106 [Grackle]
0003 MPC8240 [Kahlua]
@@ -4254,7 +4254,7 @@
270b Xantel Corporation
270f Chaintech Computer Co. Ltd
2711 AVID Technology Inc.
-2a15 3D Vision(???)
+2a15 3D Vision(?)
3000 Hansol Electronics Inc.
3142 Post Impression Systems.
3388 Hint Corp
diff -u linux_2_4/drivers/pcmcia/bulkmem.c:1.1.1.17
linux_2_4/drivers/pcmcia/bulkmem.c:1.1.1.17.2.1
--- linux_2_4/drivers/pcmcia/bulkmem.c:1.1.1.17 Sun Mar 4 15:07:08 2001
+++ linux_2_4/drivers/pcmcia/bulkmem.c Sun Mar 4 16:39:19 2001
@@ -41,6 +41,7 @@
#include <linux/mm.h>
#include <linux/sched.h>
#include <linux/timer.h>
+#include <linux/proc_fs.h>
#define IN_CARD_SERVICES
#include <pcmcia/cs_types.h>
diff -u linux_2_4/drivers/pcmcia/rsrc_mgr.c:1.1.1.16
linux_2_4/drivers/pcmcia/rsrc_mgr.c:1.1.1.16.2.1
--- linux_2_4/drivers/pcmcia/rsrc_mgr.c:1.1.1.16 Sun Mar 4 15:07:12 2001
+++ linux_2_4/drivers/pcmcia/rsrc_mgr.c Sun Mar 4 16:39:19 2001
@@ -43,6 +43,7 @@
#include <linux/slab.h>
#include <linux/ioport.h>
#include <linux/timer.h>
+#include <linux/proc_fs.h>
#include <asm/irq.h>
#include <asm/io.h>
@@ -251,7 +252,7 @@
base, base+num-1);
bad = fail = 0;
step = (num < 0x20000) ? 0x2000 : ((num>>4) & ~0x1fff);
- for (i = base; i < base+num; i = j + step) {
+ for (i = j = base; i < base+num; i = j + step) {
if (!fail) {
for (j = i; j < base+num; j += step)
if ((check_mem_resource(j, step) == 0) && is_valid(j))
diff -u linux_2_4/drivers/pcmcia/tcic.c:1.1.1.11
linux_2_4/drivers/pcmcia/tcic.c:1.1.1.11.34.1
--- linux_2_4/drivers/pcmcia/tcic.c:1.1.1.11 Sun Feb 18 14:15:15 2001
+++ linux_2_4/drivers/pcmcia/tcic.c Sun Mar 4 16:39:19 2001
@@ -49,6 +49,7 @@
#include <linux/timer.h>
#include <linux/ioport.h>
#include <linux/delay.h>
+#include <linux/proc_fs.h>
#include <pcmcia/version.h>
#include <pcmcia/cs_types.h>
diff -u linux_2_4/drivers/sound/Config.in:1.1.1.13
linux_2_4/drivers/sound/Config.in:1.1.1.13.34.1
--- linux_2_4/drivers/sound/Config.in:1.1.1.13 Sun Feb 18 14:12:58 2001
+++ linux_2_4/drivers/sound/Config.in Sun Mar 4 16:39:19 2001
@@ -6,7 +6,7 @@
# Prompt user for primary drivers.
-dep_tristate ' C-Media PCI (CMI8338/8378)' CONFIG_SOUND_CMPCI $CONFIG_SOUND
+dep_tristate ' C-Media PCI (CMI8338/8378)' CONFIG_SOUND_CMPCI $CONFIG_SOUND
+$CONFIG_PCI
if [ "$CONFIG_SOUND_CMPCI" = "y" -o "$CONFIG_SOUND_CMPCI" = "m" ]; then
bool ' Enable S/PDIF loop for CMI8738' CONFIG_SOUND_CMPCI_SPDIFLOOP
bool ' Enable 4 channel mode for CMI8738' CONFIG_SOUND_CMPCI_4CH
diff -u linux_2_4/drivers/sound/gus_midi.c:1.1.1.4
linux_2_4/drivers/sound/gus_midi.c:1.1.1.4.120.1
--- linux_2_4/drivers/sound/gus_midi.c:1.1.1.4 Tue Nov 14 14:36:28 2000
+++ linux_2_4/drivers/sound/gus_midi.c Sun Mar 4 16:39:19 2001
@@ -15,7 +15,7 @@
* Added __init to gus_midi_init()
*/
-#include "linux/init.h"
+#include <linux/init.h>
#include "sound_config.h"
#include "gus.h"
diff -u linux_2_4/drivers/sound/ymfpci.c:1.1.1.10
linux_2_4/drivers/sound/ymfpci.c:1.1.1.10.26.1
--- linux_2_4/drivers/sound/ymfpci.c:1.1.1.10 Thu Feb 22 14:29:01 2001
+++ linux_2_4/drivers/sound/ymfpci.c Sun Mar 4 16:39:22 2001
@@ -1841,7 +1841,7 @@
static int ymf_open(struct inode *inode, struct file *file)
{
struct list_head *list;
- ymfpci_t *unit;
+ ymfpci_t *unit = NULL;
int minor;
struct ymf_state *state;
int err;
diff -u linux_2_4/drivers/usb/storage/usb.h:1.1.1.24
linux_2_4/drivers/usb/storage/usb.h:1.1.1.24.2.1
--- linux_2_4/drivers/usb/storage/usb.h:1.1.1.24 Sun Mar 4 15:06:32 2001
+++ linux_2_4/drivers/usb/storage/usb.h Sun Mar 4 16:39:22 2001
@@ -181,7 +181,7 @@
extern struct semaphore us_list_semaphore;
/* The structure which defines our driver */
-struct usb_driver usb_storage_driver;
+extern struct usb_driver usb_storage_driver;
/* Function to fill an inquiry response. See usb.c for details */
extern void fill_inquiry_response(struct us_data *us,
diff -u linux_2_4/drivers/video/sis/sis_301.h:1.1.1.16
linux_2_4/drivers/video/sis/sis_301.h:1.1.1.16.2.1
--- linux_2_4/drivers/video/sis/sis_301.h:1.1.1.16 Sun Mar 4 15:05:31 2001
+++ linux_2_4/drivers/video/sis/sis_301.h Sun Mar 4 16:39:22 2001
@@ -3,7 +3,7 @@
USHORT SetFlag,RVBHCFACT,RVBHCMAX,VGAVT,VGAHT,VT,HT,VGAVDE,VGAHDE;
USHORT VDE,HDE,RVBHRS,NewFlickerMode,RY1COE,RY2COE,RY3COE,RY4COE;
-;USHORT LCDResInfo,LCDTypeInfo,LCDInfo;
+extern USHORT LCDResInfo,LCDTypeInfo,LCDInfo;
USHORT VCLKLen;
USHORT LCDHDES,LCDVDES;
diff -u linux_2_4/include/linux/802_11.h:1.1.1.15
linux_2_4/include/linux/802_11.h:1.1.1.15.2.1
--- linux_2_4/include/linux/802_11.h:1.1.1.15 Sun Mar 4 14:52:10 2001
+++ linux_2_4/include/linux/802_11.h Sun Mar 4 16:39:23 2001
@@ -188,4 +188,4 @@
}
-#endif
\ No newline at end of file
+#endif
diff -u linux_2_4/include/linux/if_frad.h:1.1.1.2
linux_2_4/include/linux/if_frad.h:1.1.1.2.156.1
--- linux_2_4/include/linux/if_frad.h:1.1.1.2 Sun Oct 22 13:27:56 2000
+++ linux_2_4/include/linux/if_frad.h Sun Mar 4 16:39:23 2001
@@ -192,9 +192,9 @@
int register_frad(const char *name);
int unregister_frad(const char *name);
-int (*dlci_ioctl_hook)(unsigned int, void *);
+extern int (*dlci_ioctl_hook)(unsigned int, void *);
-#endif __KERNEL__
+#endif /* __KERNEL__ */
#endif /* CONFIG_DLCI || CONFIG_DLCI_MODULE */
diff -u linux_2_4/net/atm/lec.c:1.1.1.4 linux_2_4/net/atm/lec.c:1.1.1.4.72.1
--- linux_2_4/net/atm/lec.c:1.1.1.4 Mon Jan 22 17:45:01 2001
+++ linux_2_4/net/atm/lec.c Sun Mar 4 16:39:23 2001
@@ -51,9 +51,9 @@
#define DPRINTK(format,args...)
#endif
-struct net_bridge_fdb_entry *(*br_fdb_get_hook)(struct net_bridge *br,
+extern struct net_bridge_fdb_entry *(*br_fdb_get_hook)(struct net_bridge *br,
unsigned char *addr);
-void (*br_fdb_put_hook)(struct net_bridge_fdb_entry *ent);
+extern void (*br_fdb_put_hook)(struct net_bridge_fdb_entry *ent);
#define DUMP_PACKETS 0 /* 0 = None,
diff -u linux_2_4/net/ipx/af_ipx.c:1.1.1.18 linux_2_4/net/ipx/af_ipx.c:1.1.1.18.2.1
--- linux_2_4/net/ipx/af_ipx.c:1.1.1.18 Sun Mar 4 14:54:38 2001
+++ linux_2_4/net/ipx/af_ipx.c Sun Mar 4 16:39:23 2001
@@ -450,11 +450,12 @@
spin_lock_bh(&ipx_interfaces_lock);
for (i = ipx_interfaces; i;) {
tmp = i->if_next;
- if (i->if_dev == dev)
+ if (i->if_dev == dev) {
if (event == NETDEV_UP)
ipxitf_hold(i);
else
__ipxitf_put(i);
+ }
i = tmp;
}
spin_unlock_bh(&ipx_interfaces_lock);
_______________________________________________
[EMAIL PROTECTED]
To unsubscribe, use the last form field at:
http://lists.sourceforge.net/lists/listinfo/linux-usb-devel
