Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ce9e3d99 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'ubuntu-updates' of master.kernel.org:/pub/scm/linux/kernel/git/bcollins/ubuntu-2.6 

* 'ubuntu-updates' of master.kernel.org:/pub/scm/linux/kernel/git/bcollins/ubuntu-2.6:
  [pci_ids] Add Quicknet XJ vendor/device ID's.
  [valkyriefb] Ifdef for when CONFIG_NVRAM isn't enabled.
  [platinumfb] Ifdef for when CONFIG_NVRAM isn't enabled.
  [igafb] Add pci dev table for module auto loading.
  [controlfb] Ifdef for when CONFIG_NVRAM isn't enabled.
  [hid-core] TurboX Keyboard needs NOGET quirk.
  [ixj] Add pci dev table for module auto loading.
  [initio] Add pci dev table for module auto loading.
  [fdomain] Add pci dev table for module auto loading.
  [BusLogic] Add pci dev table for auto module loading.
  [mv643xx] Add pci device table for auto module loading.
  [alim7101] Add pci dev table for auto module loading.
parents 64d9a39e 74d91946

drivers/char/watchdog/alim7101_wdt.c

+12 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -1557,6 +1557,12 @@ static void __exit mv643xx_cleanup_module(void) 
module_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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -1736,6 +1736,15 @@ struct scsi_host_template fdomain_driver_template = { 
};



#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
Original line number Diff line number Diff line
@@ -142,8 +142,6 @@ 
#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 @@ static int setup_debug = 0; 


static 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_NewReturnNumberOfAdapters(void) 


	for (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);