# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
# ChangeSet 1.480 -> 1.481
# drivers/usb/serial/io_tables.h 1.5 -> 1.6
# drivers/usb/media/stv680.c 1.16 -> 1.17
# drivers/usb/serial/safe_serial.c 1.3 -> 1.4
# drivers/usb/serial/ftdi_sio.c 1.29 -> 1.30
# drivers/usb/serial/ipaq.c 1.11 -> 1.12
# drivers/usb/media/se401.c 1.20 -> 1.21
# drivers/usb/serial/visor.c 1.32 -> 1.33
# drivers/usb/media/ov511.c 1.28 -> 1.29
# drivers/usb/serial/omninet.c 1.19 -> 1.20
# drivers/usb/media/vicam.c 1.14 -> 1.15
# drivers/usb/serial/whiteheat.c 1.18 -> 1.19
# drivers/usb/serial/empeg.c 1.24 -> 1.25
# drivers/usb/serial/pl2303.c 1.17 -> 1.18
# drivers/usb/serial/ir-usb.c 1.14 -> 1.15
# drivers/usb/serial/digi_acceleport.c 1.20 -> 1.21
# drivers/usb/serial/kl5kusb105.c 1.7 -> 1.8
# drivers/usb/serial/belkin_sa.c 1.21 -> 1.22
# drivers/usb/serial/keyspan_pda.c 1.18 -> 1.19
# drivers/usb/serial/mct_u232.c 1.23 -> 1.24
# drivers/usb/serial/keyspan.h 1.9 -> 1.10
# drivers/usb/media/pwc-if.c 1.21 -> 1.22
# drivers/usb/media/stv680.h 1.4 -> 1.5
# drivers/usb/serial/cyberjack.c 1.14 -> 1.15
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/06/12 [EMAIL PROTECTED] 1.481
# USB: fixed problems when CONFIG_HOTPLUG=n and usb drivers were built into the kernel.
#
# removed __devinitdata and __devinit on structures and functions that should
# not have them.
# Thanks to Tom Rini for pointing this out.
# --------------------------------------------
#
diff -Nru a/drivers/usb/media/ov511.c b/drivers/usb/media/ov511.c
--- a/drivers/usb/media/ov511.c Fri Jun 14 14:15:35 2002
+++ b/drivers/usb/media/ov511.c Fri Jun 14 14:15:35 2002
@@ -233,7 +233,7 @@
#define ov51x_mmx_available (0)
#endif
-static __devinitdata struct usb_device_id device_table [] = {
+static struct usb_device_id device_table [] = {
{ USB_DEVICE(VEND_OMNIVISION, PROD_OV511) },
{ USB_DEVICE(VEND_OMNIVISION, PROD_OV511PLUS) },
{ USB_DEVICE(VEND_OMNIVISION, PROD_OV518) },
diff -Nru a/drivers/usb/media/pwc-if.c b/drivers/usb/media/pwc-if.c
--- a/drivers/usb/media/pwc-if.c Fri Jun 14 14:15:35 2002
+++ b/drivers/usb/media/pwc-if.c Fri Jun 14 14:15:35 2002
@@ -66,7 +66,7 @@
/* Function prototypes and driver templates */
/* hotplug device table support */
-static __devinitdata struct usb_device_id pwc_device_table [] = {
+static struct usb_device_id pwc_device_table [] = {
{ USB_DEVICE(0x0471, 0x0302) },
{ USB_DEVICE(0x0471, 0x0303) },
{ USB_DEVICE(0x0471, 0x0304) },
diff -Nru a/drivers/usb/media/se401.c b/drivers/usb/media/se401.c
--- a/drivers/usb/media/se401.c Fri Jun 14 14:15:35 2002
+++ b/drivers/usb/media/se401.c Fri Jun 14 14:15:35 2002
@@ -29,7 +29,6 @@
#include <linux/config.h>
#include <linux/module.h>
-#include <linux/version.h>
#include <linux/init.h>
#include <linux/fs.h>
#include <linux/vmalloc.h>
@@ -42,18 +41,12 @@
#include <linux/wrapper.h>
#include <linux/mm.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 3, 0)
-#define virt_to_page(arg) MAP_NR(arg)
-#define vmalloc_32 vmalloc
-#endif
-
#include "se401.h"
static int flickerless=0;
static int video_nr = -1;
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 3, 0)
-static __devinitdata struct usb_device_id device_table [] = {
+static struct usb_device_id device_table [] = {
{ USB_DEVICE(0x03e8, 0x0004) },/* Endpoints/Aox SE401 */
{ USB_DEVICE(0x0471, 0x030b) },/* Philips PCVC665K */
{ USB_DEVICE(0x047d, 0x5001) },/* Kensington 67014 */
@@ -63,7 +56,6 @@
};
MODULE_DEVICE_TABLE(usb, device_table);
-#endif
MODULE_AUTHOR("Jeroen Vreeken <[EMAIL PROTECTED]>");
MODULE_DESCRIPTION("SE401 USB Camera Driver");
@@ -1402,12 +1394,8 @@
return 0;
}
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 3, 0)
-static void* se401_probe(struct usb_device *dev, unsigned int ifnum)
-#else
-static void* __devinit se401_probe(struct usb_device *dev, unsigned int ifnum,
+static void* se401_probe(struct usb_device *dev, unsigned int ifnum,
const struct usb_device_id *id)
-#endif
{
struct usb_interface_descriptor *interface;
struct usb_se401 *se401;
@@ -1535,9 +1523,7 @@
static struct usb_driver se401_driver = {
name: "se401",
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 3, 0)
id_table: device_table,
-#endif
probe: se401_probe,
disconnect: se401_disconnect
};
diff -Nru a/drivers/usb/media/stv680.c b/drivers/usb/media/stv680.c
--- a/drivers/usb/media/stv680.c Fri Jun 14 14:15:35 2002
+++ b/drivers/usb/media/stv680.c Fri Jun 14 14:15:35 2002
@@ -1449,7 +1449,7 @@
fops: &stv680_fops,
};
-static void *__devinit stv680_probe (struct usb_device *dev, unsigned int ifnum,
const struct usb_device_id *id)
+static void *stv680_probe (struct usb_device *dev, unsigned int ifnum, const struct
+usb_device_id *id)
{
struct usb_interface_descriptor *interface;
struct usb_stv *stv680;
diff -Nru a/drivers/usb/media/stv680.h b/drivers/usb/media/stv680.h
--- a/drivers/usb/media/stv680.h Fri Jun 14 14:15:35 2002
+++ b/drivers/usb/media/stv680.h Fri Jun 14 14:15:35 2002
@@ -45,7 +45,7 @@
/* fmt 4 */
#define STV_VIDEO_PALETTE VIDEO_PALETTE_RGB24
-static __devinitdata struct usb_device_id device_table[] = {
+static struct usb_device_id device_table[] = {
{USB_DEVICE (USB_PENCAM_VENDOR_ID, USB_PENCAM_PRODUCT_ID)},
{}
};
diff -Nru a/drivers/usb/media/vicam.c b/drivers/usb/media/vicam.c
--- a/drivers/usb/media/vicam.c Fri Jun 14 14:15:35 2002
+++ b/drivers/usb/media/vicam.c Fri Jun 14 14:15:35 2002
@@ -787,7 +787,7 @@
return 1;
}
-static void * __devinit vicam_probe(struct usb_device *udev, unsigned int ifnum,
+static void *vicam_probe(struct usb_device *udev, unsigned int ifnum,
const struct usb_device_id *id)
{
struct usb_vicam *vicam;
diff -Nru a/drivers/usb/serial/belkin_sa.c b/drivers/usb/serial/belkin_sa.c
--- a/drivers/usb/serial/belkin_sa.c Fri Jun 14 14:15:35 2002
+++ b/drivers/usb/serial/belkin_sa.c Fri Jun 14 14:15:35 2002
@@ -103,7 +103,7 @@
static void belkin_sa_break_ctl (struct usb_serial_port *port, int
break_state );
-static __devinitdata struct usb_device_id id_table_combined [] = {
+static struct usb_device_id id_table_combined [] = {
{ USB_DEVICE(BELKIN_SA_VID, BELKIN_SA_PID) },
{ USB_DEVICE(BELKIN_OLD_VID, BELKIN_OLD_PID) },
{ USB_DEVICE(PERACOM_VID, PERACOM_PID) },
diff -Nru a/drivers/usb/serial/cyberjack.c b/drivers/usb/serial/cyberjack.c
--- a/drivers/usb/serial/cyberjack.c Fri Jun 14 14:15:35 2002
+++ b/drivers/usb/serial/cyberjack.c Fri Jun 14 14:15:35 2002
@@ -66,7 +66,7 @@
static void cyberjack_read_bulk_callback (struct urb *urb);
static void cyberjack_write_bulk_callback (struct urb *urb);
-static __devinitdata struct usb_device_id id_table [] = {
+static struct usb_device_id id_table [] = {
{ USB_DEVICE(CYBERJACK_VENDOR_ID, CYBERJACK_PRODUCT_ID) },
{ } /* Terminating entry */
};
diff -Nru a/drivers/usb/serial/digi_acceleport.c b/drivers/usb/serial/digi_acceleport.c
--- a/drivers/usb/serial/digi_acceleport.c Fri Jun 14 14:15:35 2002
+++ b/drivers/usb/serial/digi_acceleport.c Fri Jun 14 14:15:35 2002
@@ -483,12 +483,12 @@
{ } /* Terminating entry */
};
-static __devinitdata struct usb_device_id id_table_2 [] = {
+static struct usb_device_id id_table_2 [] = {
{ USB_DEVICE(DIGI_VENDOR_ID, DIGI_2_ID) },
{ } /* Terminating entry */
};
-static __devinitdata struct usb_device_id id_table_4 [] = {
+static struct usb_device_id id_table_4 [] = {
{ USB_DEVICE(DIGI_VENDOR_ID, DIGI_4_ID) },
{ } /* Terminating entry */
};
diff -Nru a/drivers/usb/serial/empeg.c b/drivers/usb/serial/empeg.c
--- a/drivers/usb/serial/empeg.c Fri Jun 14 14:15:35 2002
+++ b/drivers/usb/serial/empeg.c Fri Jun 14 14:15:35 2002
@@ -103,7 +103,7 @@
static void empeg_write_bulk_callback (struct urb *urb);
static void empeg_read_bulk_callback (struct urb *urb);
-static __devinitdata struct usb_device_id id_table [] = {
+static struct usb_device_id id_table [] = {
{ USB_DEVICE(EMPEG_VENDOR_ID, EMPEG_PRODUCT_ID) },
{ } /* Terminating entry */
};
diff -Nru a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
--- a/drivers/usb/serial/ftdi_sio.c Fri Jun 14 14:15:35 2002
+++ b/drivers/usb/serial/ftdi_sio.c Fri Jun 14 14:15:35 2002
@@ -120,7 +120,7 @@
#define DRIVER_AUTHOR "Greg Kroah-Hartman <[EMAIL PROTECTED]>, Bill Ryder
<[EMAIL PROTECTED]>"
#define DRIVER_DESC "USB FTDI RS232 Converters Driver"
-static __devinitdata struct usb_device_id id_table_sio [] = {
+static struct usb_device_id id_table_sio [] = {
{ USB_DEVICE(FTDI_VID, FTDI_SIO_PID) },
{ } /* Terminating entry */
};
@@ -133,7 +133,7 @@
*/
-static __devinitdata struct usb_device_id id_table_8U232AM [] = {
+static struct usb_device_id id_table_8U232AM [] = {
{ USB_DEVICE(FTDI_VID, FTDI_8U232AM_PID) },
{ USB_DEVICE(FTDI_NF_RIC_VID, FTDI_NF_RIC_PID) },
{ } /* Terminating entry */
diff -Nru a/drivers/usb/serial/io_tables.h b/drivers/usb/serial/io_tables.h
--- a/drivers/usb/serial/io_tables.h Fri Jun 14 14:15:35 2002
+++ b/drivers/usb/serial/io_tables.h Fri Jun 14 14:15:35 2002
@@ -14,12 +14,12 @@
#ifndef IO_TABLES_H
#define IO_TABLES_H
-static __devinitdata struct usb_device_id edgeport_1port_id_table [] = {
+static struct usb_device_id edgeport_1port_id_table [] = {
{ USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_EDGEPORT_PARALLEL_PORT) },
{ }
};
-static __devinitdata struct usb_device_id edgeport_2port_id_table [] = {
+static struct usb_device_id edgeport_2port_id_table [] = {
{ USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_EDGEPORT_2) },
{ USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_EDGEPORT_2I) },
{ USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_EDGEPORT_421) },
@@ -33,7 +33,7 @@
{ }
};
-static __devinitdata struct usb_device_id edgeport_4port_id_table [] = {
+static struct usb_device_id edgeport_4port_id_table [] = {
{ USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_EDGEPORT_4) },
{ USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_RAPIDPORT_4) },
{ USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_EDGEPORT_4T) },
@@ -50,7 +50,7 @@
{ }
};
-static __devinitdata struct usb_device_id edgeport_8port_id_table [] = {
+static struct usb_device_id edgeport_8port_id_table [] = {
{ USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_EDGEPORT_8) },
{ USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_EDGEPORT_16_DUAL_CPU) },
{ USB_DEVICE(USB_VENDOR_ID_ION, ION_DEVICE_ID_EDGEPORT_8I) },
diff -Nru a/drivers/usb/serial/ipaq.c b/drivers/usb/serial/ipaq.c
--- a/drivers/usb/serial/ipaq.c Fri Jun 14 14:15:35 2002
+++ b/drivers/usb/serial/ipaq.c Fri Jun 14 14:15:35 2002
@@ -78,7 +78,7 @@
static void ipaq_destroy_lists(struct usb_serial_port *port);
-static __devinitdata struct usb_device_id ipaq_id_table [] = {
+static struct usb_device_id ipaq_id_table [] = {
{ USB_DEVICE(COMPAQ_VENDOR_ID, COMPAQ_IPAQ_ID) },
{ USB_DEVICE(HP_VENDOR_ID, HP_JORNADA_548_ID) },
{ USB_DEVICE(HP_VENDOR_ID, HP_JORNADA_568_ID) },
diff -Nru a/drivers/usb/serial/ir-usb.c b/drivers/usb/serial/ir-usb.c
--- a/drivers/usb/serial/ir-usb.c Fri Jun 14 14:15:35 2002
+++ b/drivers/usb/serial/ir-usb.c Fri Jun 14 14:15:35 2002
@@ -119,7 +119,7 @@
static u8 ir_xbof = 0;
static u8 ir_add_bof = 0;
-static __devinitdata struct usb_device_id id_table [] = {
+static struct usb_device_id id_table [] = {
{ USB_DEVICE(0x050f, 0x0180) }, /* KC Technology, KC-180 */
{ USB_DEVICE(0x08e9, 0x0100) }, /* XTNDAccess */
{ USB_DEVICE(0x09c4, 0x0011) }, /* ACTiSys ACT-IR2000U */
diff -Nru a/drivers/usb/serial/keyspan.h b/drivers/usb/serial/keyspan.h
--- a/drivers/usb/serial/keyspan.h Fri Jun 14 14:15:35 2002
+++ b/drivers/usb/serial/keyspan.h Fri Jun 14 14:15:35 2002
@@ -435,7 +435,7 @@
MODULE_DEVICE_TABLE(usb, keyspan_ids_combined);
/* usb_device_id table for the pre-firmware download keyspan devices */
-static __devinitdata struct usb_device_id keyspan_pre_ids[] = {
+static struct usb_device_id keyspan_pre_ids[] = {
{ USB_DEVICE(KEYSPAN_VENDOR_ID, keyspan_usa18x_pre_product_id) },
{ USB_DEVICE(KEYSPAN_VENDOR_ID, keyspan_usa19_pre_product_id) },
{ USB_DEVICE(KEYSPAN_VENDOR_ID, keyspan_usa19qi_pre_product_id) },
@@ -449,7 +449,7 @@
{ } /* Terminating entry */
};
-static __devinitdata struct usb_device_id keyspan_1port_ids[] = {
+static struct usb_device_id keyspan_1port_ids[] = {
{ USB_DEVICE(KEYSPAN_VENDOR_ID, keyspan_usa18x_product_id) },
{ USB_DEVICE(KEYSPAN_VENDOR_ID, keyspan_usa19_product_id) },
{ USB_DEVICE(KEYSPAN_VENDOR_ID, keyspan_usa19qi_product_id) },
@@ -458,14 +458,14 @@
{ } /* Terminating entry */
};
-static __devinitdata struct usb_device_id keyspan_2port_ids[] = {
+static struct usb_device_id keyspan_2port_ids[] = {
{ USB_DEVICE(KEYSPAN_VENDOR_ID, keyspan_usa28_product_id) },
{ USB_DEVICE(KEYSPAN_VENDOR_ID, keyspan_usa28x_product_id) },
{ USB_DEVICE(KEYSPAN_VENDOR_ID, keyspan_usa28xa_product_id) },
{ } /* Terminating entry */
};
-static __devinitdata struct usb_device_id keyspan_4port_ids[] = {
+static struct usb_device_id keyspan_4port_ids[] = {
{ USB_DEVICE(KEYSPAN_VENDOR_ID, keyspan_usa49w_product_id) },
{ } /* Terminating entry */
};
diff -Nru a/drivers/usb/serial/keyspan_pda.c b/drivers/usb/serial/keyspan_pda.c
--- a/drivers/usb/serial/keyspan_pda.c Fri Jun 14 14:15:35 2002
+++ b/drivers/usb/serial/keyspan_pda.c Fri Jun 14 14:15:35 2002
@@ -154,20 +154,20 @@
MODULE_DEVICE_TABLE (usb, id_table_combined);
-static __devinitdata struct usb_device_id id_table_std [] = {
+static struct usb_device_id id_table_std [] = {
{ USB_DEVICE(KEYSPAN_VENDOR_ID, KEYSPAN_PDA_ID) },
{ } /* Terminating entry */
};
#ifdef KEYSPAN
-static __devinitdata struct usb_device_id id_table_fake [] = {
+static struct usb_device_id id_table_fake [] = {
{ USB_DEVICE(KEYSPAN_VENDOR_ID, KEYSPAN_PDA_FAKE_ID) },
{ } /* Terminating entry */
};
#endif
#ifdef XIRCOM
-static __devinitdata struct usb_device_id id_table_fake_xircom [] = {
+static struct usb_device_id id_table_fake_xircom [] = {
{ USB_DEVICE(XIRCOM_VENDOR_ID, XIRCOM_FAKE_ID) },
{ USB_DEVICE(ENTREGRA_VENDOR_ID, ENTREGRA_FAKE_ID) },
{ }
diff -Nru a/drivers/usb/serial/kl5kusb105.c b/drivers/usb/serial/kl5kusb105.c
--- a/drivers/usb/serial/kl5kusb105.c Fri Jun 14 14:15:35 2002
+++ b/drivers/usb/serial/kl5kusb105.c Fri Jun 14 14:15:35 2002
@@ -109,7 +109,7 @@
/*
* All of the device info needed for the KLSI converters.
*/
-static __devinitdata struct usb_device_id id_table [] = {
+static struct usb_device_id id_table [] = {
{ USB_DEVICE(PALMCONNECT_VID, PALMCONNECT_PID) },
{ USB_DEVICE(KLSI_VID, KLSI_KL5KUSB105D_PID) },
{ } /* Terminating entry */
diff -Nru a/drivers/usb/serial/mct_u232.c b/drivers/usb/serial/mct_u232.c
--- a/drivers/usb/serial/mct_u232.c Fri Jun 14 14:15:35 2002
+++ b/drivers/usb/serial/mct_u232.c Fri Jun 14 14:15:35 2002
@@ -129,7 +129,7 @@
/*
* All of the device info needed for the MCT USB-RS232 converter.
*/
-static __devinitdata struct usb_device_id id_table_combined [] = {
+static struct usb_device_id id_table_combined [] = {
{ USB_DEVICE(MCT_U232_VID, MCT_U232_PID) },
{ USB_DEVICE(MCT_U232_VID, MCT_U232_SITECOM_PID) },
{ USB_DEVICE(MCT_U232_VID, MCT_U232_DU_H3SP_PID) },
diff -Nru a/drivers/usb/serial/omninet.c b/drivers/usb/serial/omninet.c
--- a/drivers/usb/serial/omninet.c Fri Jun 14 14:15:35 2002
+++ b/drivers/usb/serial/omninet.c Fri Jun 14 14:15:35 2002
@@ -76,7 +76,7 @@
static int omninet_write_room (struct usb_serial_port *port);
static void omninet_shutdown (struct usb_serial *serial);
-static __devinitdata struct usb_device_id id_table [] = {
+static struct usb_device_id id_table [] = {
{ USB_DEVICE(ZYXEL_VENDOR_ID, ZYXEL_OMNINET_ID) },
{ } /* Terminating entry */
};
diff -Nru a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c
--- a/drivers/usb/serial/pl2303.c Fri Jun 14 14:15:35 2002
+++ b/drivers/usb/serial/pl2303.c Fri Jun 14 14:15:35 2002
@@ -65,7 +65,7 @@
-static __devinitdata struct usb_device_id id_table [] = {
+static struct usb_device_id id_table [] = {
{ USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID) },
{ USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_RSAQ2) },
{ USB_DEVICE(IODATA_VENDOR_ID, IODATA_PRODUCT_ID) },
diff -Nru a/drivers/usb/serial/safe_serial.c b/drivers/usb/serial/safe_serial.c
--- a/drivers/usb/serial/safe_serial.c Fri Jun 14 14:15:35 2002
+++ b/drivers/usb/serial/safe_serial.c Fri Jun 14 14:15:35 2002
@@ -140,7 +140,7 @@
bInterfaceClass: (ic), \
bInterfaceSubClass: (isc),
-static __devinitdata struct usb_device_id id_table[] = {
+static struct usb_device_id id_table[] = {
{MY_USB_DEVICE (0x49f, 0xffff, CDC_DEVICE_CLASS, LINEO_INTERFACE_CLASS,
LINEO_INTERFACE_SUBCLASS_SAFESERIAL)}, // Itsy
{MY_USB_DEVICE (0x3f0, 0x2101, CDC_DEVICE_CLASS, LINEO_INTERFACE_CLASS,
LINEO_INTERFACE_SUBCLASS_SAFESERIAL)}, // Calypso
{MY_USB_DEVICE (0x4dd, 0x8001, CDC_DEVICE_CLASS, LINEO_INTERFACE_CLASS,
LINEO_INTERFACE_SUBCLASS_SAFESERIAL)}, // Iris
diff -Nru a/drivers/usb/serial/visor.c b/drivers/usb/serial/visor.c
--- a/drivers/usb/serial/visor.c Fri Jun 14 14:15:35 2002
+++ b/drivers/usb/serial/visor.c Fri Jun 14 14:15:35 2002
@@ -177,7 +177,7 @@
static int clie_3_5_startup (struct usb_serial *serial);
-static __devinitdata struct usb_device_id combined_id_table [] = {
+static struct usb_device_id id_table [] = {
{ USB_DEVICE(PALM_VENDOR_ID, PALM_M500_ID) },
{ USB_DEVICE(PALM_VENDOR_ID, PALM_M505_ID) },
{ USB_DEVICE(PALM_VENDOR_ID, PALM_M515_ID) },
@@ -191,12 +191,12 @@
{ } /* Terminating entry */
};
-static __devinitdata struct usb_device_id clie_id_3_5_table [] = {
+static struct usb_device_id clie_id_3_5_table [] = {
{ USB_DEVICE(SONY_VENDOR_ID, SONY_CLIE_3_5_ID) },
{ } /* Terminating entry */
};
-static __devinitdata struct usb_device_id id_table [] = {
+static __devinitdata struct usb_device_id id_table_combined [] = {
{ USB_DEVICE(HANDSPRING_VENDOR_ID, HANDSPRING_VISOR_ID) },
{ USB_DEVICE(PALM_VENDOR_ID, PALM_M500_ID) },
{ USB_DEVICE(PALM_VENDOR_ID, PALM_M505_ID) },
@@ -211,7 +211,7 @@
{ } /* Terminating entry */
};
-MODULE_DEVICE_TABLE (usb, id_table);
+MODULE_DEVICE_TABLE (usb, id_table_combined);
@@ -219,7 +219,7 @@
static struct usb_serial_device_type handspring_device = {
owner: THIS_MODULE,
name: "Handspring Visor / Palm 4.0 / Cli� 4.x",
- id_table: combined_id_table,
+ id_table: id_table,
num_interrupt_in: 0,
num_bulk_in: 2,
num_bulk_out: 2,
diff -Nru a/drivers/usb/serial/whiteheat.c b/drivers/usb/serial/whiteheat.c
--- a/drivers/usb/serial/whiteheat.c Fri Jun 14 14:15:35 2002
+++ b/drivers/usb/serial/whiteheat.c Fri Jun 14 14:15:35 2002
@@ -100,12 +100,12 @@
separate ID tables, and then a third table that combines them
just for the purpose of exporting the autoloading information.
*/
-static __devinitdata struct usb_device_id id_table_std [] = {
+static struct usb_device_id id_table_std [] = {
{ USB_DEVICE(CONNECT_TECH_VENDOR_ID, CONNECT_TECH_WHITE_HEAT_ID) },
{ } /* Terminating entry */
};
-static __devinitdata struct usb_device_id id_table_prerenumeration [] = {
+static struct usb_device_id id_table_prerenumeration [] = {
{ USB_DEVICE(CONNECT_TECH_VENDOR_ID, CONNECT_TECH_FAKE_WHITE_HEAT_ID) },
{ } /* Terminating entry */
};
_______________________________________________________________
Don't miss the 2002 Sprint PCS Application Developer's Conference
August 25-28 in Las Vegas -
http://devcon.sprintpcs.com/adp/index.cfm?source=osdntextlink
_______________________________________________
[EMAIL PROTECTED]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
