From aa37f3b279efcdfed48335a8c1fa6a85d8da90c2 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Mon, 10 Mar 2008 11:43:34 -0700 Subject: [PATCH] --- yaml --- r: 87071 b: refs/heads/master c: 9f9351bbe34a9b12966b1fb6f7c21cfe128340c1 h: refs/heads/master i: 87069: 22fa521dcf6495e16786ba7036ebd9e1bf599b9e 87067: 3f32b86d559b5272db98bf38eb0517afdc778999 87063: 23bbe5d7945d57b75c8d3571d158ba3f7c9f11df 87055: 8cf07fcbad0d2e456600cab4dc10f8849d0009a1 87039: 0da71f2c2630dfb8d3c1a6fdcb775113c1de9301 v: v3 --- [refs] | 2 +- trunk/Documentation/pci.txt | 4 ++-- trunk/include/linux/pci.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index aa40b2ce54ce..e66e234b0ee0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f4299e1943d0c9ce29a6c5dc7c7674a82a17b315 +refs/heads/master: 9f9351bbe34a9b12966b1fb6f7c21cfe128340c1 diff --git a/trunk/Documentation/pci.txt b/trunk/Documentation/pci.txt index bb7bd27d4682..d2c2e6e2b224 100644 --- a/trunk/Documentation/pci.txt +++ b/trunk/Documentation/pci.txt @@ -123,7 +123,7 @@ initialization with a pointer to a structure describing the driver The ID table is an array of struct pci_device_id entries ending with an -all-zero entry; use of the macro DECLARE_PCI_DEVICE_TABLE is the preferred +all-zero entry; use of the macro DEFINE_PCI_DEVICE_TABLE is the preferred method of declaring the table. Each entry consists of: vendor,device Vendor and device ID to match (or PCI_ANY_ID) @@ -193,7 +193,7 @@ Tips on when/where to use the above attributes: o Do not mark the struct pci_driver. o The ID table array should be marked __devinitconst; this is done - automatically if the table is declared with DECLARE_PCI_DEVICE_TABLE(). + automatically if the table is declared with DEFINE_PCI_DEVICE_TABLE(). o The probe() and remove() functions should be marked __devinit and __devexit respectively. All initialization functions diff --git a/trunk/include/linux/pci.h b/trunk/include/linux/pci.h index f3165e7ac431..38eff1947750 100644 --- a/trunk/include/linux/pci.h +++ b/trunk/include/linux/pci.h @@ -389,13 +389,13 @@ struct pci_driver { #define to_pci_driver(drv) container_of(drv, struct pci_driver, driver) /** - * DECLARE_PCI_DEVICE_TABLE - macro used to describe a pci device table + * DEFINE_PCI_DEVICE_TABLE - macro used to describe a pci device table * @_table: device table name * * This macro is used to create a struct pci_device_id array (a device table) * in a generic manner. */ -#define DECLARE_PCI_DEVICE_TABLE(_table) \ +#define DEFINE_PCI_DEVICE_TABLE(_table) \ const struct pci_device_id _table[] __devinitconst /**