Sync trivial Ubuntu patches
Subsystems (7)
PATCH 1/1 Sync trivial Ubuntu patches
Linus, please pull the following changes (log, diffstat and patch attached) from:
rsync.kernel.org:/pub/scm/linux/kernel/git/bcollins/ubuntu-2.6#ubuntu-updates
These are mostly changes to add a MODULE_DEVICE_TABLE so modules can be autoloaded. This doesn't really give them hotplug functionality, but it does make it easier for users and distros to leave these as modules that only get loaded when they're needed.
The rest is just random trivial stuff that I've collected in the Ubuntu kernel. I'll be working on syncing the more difficult patches individually.
Ben Collins:
[alim7101] Add pci dev table for auto module loading. [mv643xx] Add pci device table for auto module loading. [BusLogic] Add pci dev table for auto module loading. [fdomain] Add pci dev table for module auto loading. [initio] Add pci dev table for module auto loading. [ixj] Add pci dev table for module auto loading. [hid-core] TurboX Keyboard needs NOGET quirk. [controlfb] Ifdef for when CONFIG_NVRAM isn't enabled. [igafb] Add pci dev table for module auto loading. [platinumfb] Ifdef for when CONFIG_NVRAM isn't enabled. [valkyriefb] Ifdef for when CONFIG_NVRAM isn't enabled. [pci_ids] Add Quicknet XJ vendor/device ID's.
drivers/char/watchdog/alim7101_wdt.c | 13 ++++++++++++- drivers/net/mv643xx_eth.c | 6 ++++++ drivers/scsi/BusLogic.c | 11 +++++++++++ drivers/scsi/fdomain.c | 9 +++++++++ drivers/scsi/initio.c | 19 ++++++++++--------- drivers/telephony/ixj.c | 11 ++++++++++- drivers/usb/input/hid-core.c | 5 +++++ drivers/video/controlfb.c | 8 ++++++-- drivers/video/igafb.c | 7 +++++++ drivers/video/platinumfb.c | 5 ++++- drivers/video/valkyriefb.c | 4 ++-- include/linux/pci_ids.h | 2 ++ 12 files changed, 84 insertions(+), 16 deletions(-)
drivers/char/watchdog/alim7101_wdt.c +12 -1
@@ -77,7 +77,8 @@ static struct pci_dev *alim7101_pmu;static int nowayout =WATCHDOG_NOWAYOUT ;module_param (nowayout, int,0 ); -MODULE_PARM_DESC (nowayout,"Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)" ); +MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" + __stringify(CONFIG_WATCHDOG_NOWAYOUT) ")");/* * Whack the dog
@@ -415,6 +416,16 @@ err_out:module_init (alim7101_wdt_init);module_exit (alim7101_wdt_unload); +static struct pci_device_id alim7101_pci_tbl[]__devinitdata = { + {PCI_VENDOR_ID_AL ,PCI_DEVICE_ID_AL_M1533 , +PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 }, + {PCI_VENDOR_ID_AL ,PCI_DEVICE_ID_AL_M7101 , +PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 }, + { } +}; + +MODULE_DEVICE_TABLE (pci, alim7101_pci_tbl); +MODULE_AUTHOR ("Steve Hill" );MODULE_DESCRIPTION ("ALi M7101 PMU Computer Watchdog Timer driver" );MODULE_LICENSE ("GPL" );
drivers/net/mv643xx_eth.c +6 -0
@@ -1557,6 +1557,12 @@ static void __exit mv643xx_cleanup_modulmodule_init (mv643xx_init_module);module_exit (mv643xx_cleanup_module); +static struct pci_device_id pci_marvell_mv64360[] = { + {PCI_DEVICE (PCI_VENDOR_ID_MARVELL ,PCI_DEVICE_ID_MARVELL_MV64360 ) }, + {} +}; +MODULE_DEVICE_TABLE (pci, pci_marvell_mv64360); +MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Rabeeh Khoury, Assaf Hoffman, Matthew Dharm, Manish Lachwani" " and Dale Farnsworth" );
drivers/scsi/BusLogic.c +11 -0
@@ -3600,5 +3600,16 @@ static void __exit BusLogic_exit(void)__setup ("BusLogic=" , BusLogic_Setup); +static struct pci_device_id BusLogic_pci_tbl[]__devinitdata = { + {PCI_VENDOR_ID_BUSLOGIC ,PCI_DEVICE_ID_BUSLOGIC_MULTIMASTER , +PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 }, + {PCI_VENDOR_ID_BUSLOGIC ,PCI_DEVICE_ID_BUSLOGIC_MULTIMASTER_NC , +PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 }, + {PCI_VENDOR_ID_BUSLOGIC ,PCI_DEVICE_ID_BUSLOGIC_FLASHPOINT , +PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 }, + { } +}; +MODULE_DEVICE_TABLE (pci, BusLogic_pci_tbl); +module_init (BusLogic_init);module_exit (BusLogic_exit);
drivers/scsi/fdomain.c +9 -0
@@ -1736,6 +1736,15 @@ struct scsi_host_template fdomain_driver };#ifndef PCMCIA + +static struct pci_device_id fdomain_pci_tbl[]__devinitdata = { + {PCI_VENDOR_ID_FD ,PCI_DEVICE_ID_FD_36C70 , +PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0UL }, + { } +}; +MODULE_DEVICE_TABLE (pci, fdomain_pci_tbl); +#define driver_template fdomain_driver_template#include "scsi_module.c" +#endif
drivers/scsi/initio.c +10 -9
@@ -142,8 +142,6 @@ #define SENSE_SIZE 14#define i91u_MAXQUEUE 2#define i91u_REVID "Initio INI-9X00U/UW SCSI device driver; Revision: 1.04a" -#define INI_VENDOR_ID 0x1101/* Initio's PCI vendor ID */ -#define DMX_VENDOR_ID 0x134a/* Domex's PCI vendor ID */ #define I950_DEVICE_ID 0x9500/* Initio's inic-950 product ID */ #define I940_DEVICE_ID 0x9400/* Initio's inic-940 product ID */ #define I935_DEVICE_ID 0x9401/* Initio's inic-935 product ID */
@@ -171,13 +169,16 @@ #endifstatic void i91uSCBPost (BYTE * pHcb,BYTE * pScb); -static const PCI_ID i91u_pci_devices[] = { - {INI_VENDOR_ID ,I950_DEVICE_ID }, - {INI_VENDOR_ID ,I940_DEVICE_ID }, - {INI_VENDOR_ID ,I935_DEVICE_ID }, - {INI_VENDOR_ID ,I920_DEVICE_ID }, - {DMX_VENDOR_ID ,I920_DEVICE_ID }, +/* PCI Devices supported by this driver */ +static struct pci_device_id i91u_pci_devices[]__devinitdata = { + {PCI_VENDOR_ID_INIT ,I950_DEVICE_ID ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 }, + {PCI_VENDOR_ID_INIT ,I940_DEVICE_ID ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 }, + {PCI_VENDOR_ID_INIT ,I935_DEVICE_ID ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 }, + {PCI_VENDOR_ID_INIT ,I920_DEVICE_ID ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 }, + {PCI_VENDOR_ID_DOMEX ,I920_DEVICE_ID ,PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 }, + { } }; +MODULE_DEVICE_TABLE (pci, i91u_pci_devices);#define DEBUG_INTERRUPT 0#define DEBUG_QUEUE 0
@@ -2771,7 +2772,7 @@ static int tul_NewReturnNumberOfAdaptersfor (i =0 ; i <ARRAY_SIZE (i91u_pci_devices); i++) { -while ((pDev =pci_find_device (i91u_pci_devices[i].vendor_id, i91u_pci_devices[i].device_id, pDev)) !=NULL ) { +while ((pDev =pci_find_device (i91u_pci_devices[i].vendor, i91u_pci_devices[i].device, pDev)) !=NULL ) {if (pci_enable_device (pDev))continue ;pci_read_config_dword (pDev,0x44 , (u32 *) & dRegValue);
drivers/telephony/ixj.c +10 -1
@@ -284,6 +284,14 @@ static int samplerate = 100;module_param (ixjdebug, int,0 ); +static struct pci_device_id ixj_pci_tbl[]__devinitdata = { + {PCI_VENDOR_ID_QUICKNET ,PCI_DEVICE_ID_QUICKNET_XJ , +PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 }, + { } +}; + +MODULE_DEVICE_TABLE (pci, ixj_pci_tbl); +/************************************************************************ * * ixjdebug meanings are now bit mapped instead of level based
@@ -7683,7 +7691,8 @@ static int __init ixj_probe_pci(int *cntIXJ *j =NULL ;for (i =0 ; i <IXJMAX - *cnt; i++) { - pci =pci_find_device (0x15E2 ,0x0500 , pci); + pci =pci_find_device (PCI_VENDOR_ID_QUICKNET , +PCI_DEVICE_ID_QUICKNET_XJ , pci);if (!pci)break ;
drivers/usb/input/hid-core.c +5 -0
@@ -1391,6 +1391,9 @@ void hid_close(struct hid_device *hid)#define USB_VENDOR_ID_PANJIT 0x134c +#define USB_VENDOR_ID_TURBOX 0x062a +#define USB_DEVICE_ID_TURBOX_KEYBOARD 0x0201 +/* * Initialize all reports */
@@ -1778,6 +1781,8 @@ static const struct hid_blacklist { { USB_VENDOR_ID_PANJIT, 0x0003, HID_QUIRK_IGNORE }, { USB_VENDOR_ID_PANJIT, 0x0004, HID_QUIRK_IGNORE }, + { USB_VENDOR_ID_TURBOX, USB_DEVICE_ID_TURBOX_KEYBOARD, HID_QUIRK_NOGET }, + { 0, 0 } };
drivers/video/controlfb.c +6 -2
@@ -415,13 +415,15 @@ static int __init init_control(struct fb full = p->total_vram ==0x400000 ;/* Try to pick a video mode out of NVRAM if we have one. */ +#ifdef CONFIG_NVRAM if (default_cmode ==CMODE_NVRAM ){ cmode =nvram_read_byte (NV_CMODE );if (cmode <CMODE_8 || cmode >CMODE_32 ) cmode =CMODE_8 ; } else +#endif cmode=default_cmode; - +#ifdef CONFIG_NVRAM if (default_vmode ==VMODE_NVRAM ) { vmode =nvram_read_byte (NV_VMODE ); if (vmode < 1 || vmode > VMODE_MAX ||
@@ -432,7 +434,9 @@ static int __init init_control(struct fbif (control_mac_modes[vmode -1 ].m[full] < cmode) vmode = VMODE_640_480_60; } - }else { + } else +#endif + { vmode=default_vmode;if (control_mac_modes[vmode -1 ].m[full] < cmode) {if (cmode >CMODE_8 )
drivers/video/igafb.c +7 -0
@@ -573,3 +573,10 @@ int __init igafb_setup(char *options)module_init (igafb_init);MODULE_LICENSE ("GPL" ); +static struct pci_device_id igafb_pci_tbl[]__devinitdata = { + {PCI_VENDOR_ID_INTERG ,PCI_DEVICE_ID_INTERG_1682 , +PCI_ANY_ID ,PCI_ANY_ID ,0 ,0 ,0 }, + { } +}; + +MODULE_DEVICE_TABLE (pci, igafb_pci_tbl);
drivers/video/platinumfb.c +4 -1
@@ -339,11 +339,12 @@ static int __devinit platinum_init_fb(st sense =read_platinum_sense (pinfo);printk (KERN_INFO "platinumfb: Monitor sense value = 0x%x, " , sense); -if (default_vmode ==VMODE_NVRAM ) { +#ifdef CONFIG_NVRAM default_vmode =nvram_read_byte (NV_VMODE );if (default_vmode <=0 || default_vmode >VMODE_MAX || !platinum_reg_init[default_vmode-1]) +#endif default_vmode =VMODE_CHOOSE ; }if (default_vmode ==VMODE_CHOOSE ) {
@@ -351,8 +352,10 @@ static int __devinit platinum_init_fb(st }if (default_vmode <=0 || default_vmode >VMODE_MAX ) default_vmode =VMODE_640_480_60 ; +#ifdef CONFIG_NVRAM if (default_cmode ==CMODE_NVRAM ) default_cmode =nvram_read_byte (NV_CMODE ); +#endif if (default_cmode <CMODE_8 || default_cmode >CMODE_32 ) default_cmode =CMODE_8 ;/*
drivers/video/valkyriefb.c +2 -2
@@ -284,7 +284,7 @@ static void __init valkyrie_choose_mode(printk (KERN_INFO "Monitor sense value = 0x%x\n" , p->sense);/* Try to pick a video mode out of NVRAM if we have one. */ -#ifndef CONFIG_MAC +#if !defined(CONFIG_MAC ) && defined(CONFIG_NVRAM )if (default_vmode ==VMODE_NVRAM ) { default_vmode =nvram_read_byte (NV_VMODE ); if (default_vmode <= 0
@@ -297,7 +297,7 @@ #endif default_vmode =mac_map_monitor_sense (p->sense);if (!valkyrie_reg_init[default_vmode -1 ]) default_vmode =VMODE_640_480_67 ; -#ifndef CONFIG_MAC +#if !defined(CONFIG_MAC ) && defined(CONFIG_NVRAM )if (default_cmode ==CMODE_NVRAM ) default_cmode =nvram_read_byte (NV_CMODE );#endif
include/linux/pci_ids.h +2 -0
@@ -2351,3 +2351,5 @@ #define PCI_DEVICE_ID_RME_DIGI32 0x9896#define PCI_DEVICE_ID_RME_DIGI32_PRO 0x9897#define PCI_DEVICE_ID_RME_DIGI32_8 0x9898 +#define PCI_VENDOR_ID_QUICKNET 0x15E2 +#define PCI_DEVICE_ID_QUICKNET_XJ 0x0500