diff mbox

[1/3] pci_ids: put Hudson-2 device IDs together

Message ID 1369999039-1983-1-git-send-email-shane.huang@amd.com
State Not Applicable
Delegated to: David Miller
Headers show

Commit Message

Shane Huang May 31, 2013, 11:17 a.m. UTC
To put all AMD Hudson-2 device IDs together for better maintenance.

Signed-off-by: Shane Huang <shane.huang@amd.com>
---
 include/linux/pci_ids.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Tejun Heo May 31, 2013, 3:33 a.m. UTC | #1
On Fri, May 31, 2013 at 07:17:19PM +0800, Shane Huang wrote:
> To put all AMD Hudson-2 device IDs together for better maintenance.
> 
> Signed-off-by: Shane Huang <shane.huang@amd.com>

Bjorn, how should we route these patches?  The second will conflict
with the first.  If it's okay, I can take the first two through libata
tree.

Thanks.
Jean Delvare May 31, 2013, 6:05 a.m. UTC | #2
On Fri, 31 May 2013 19:17:19 +0800, Shane Huang wrote:
> To put all AMD Hudson-2 device IDs together for better maintenance.
> 
> Signed-off-by: Shane Huang <shane.huang@amd.com>
> ---
>  include/linux/pci_ids.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
> index c129162..e0b5623 100644
> --- a/include/linux/pci_ids.h
> +++ b/include/linux/pci_ids.h
> @@ -556,7 +556,6 @@
>  #define PCI_DEVICE_ID_AMD_8131_BRIDGE	0x7450
>  #define PCI_DEVICE_ID_AMD_8131_APIC	0x7451
>  #define PCI_DEVICE_ID_AMD_8132_BRIDGE	0x7458
> -#define PCI_DEVICE_ID_AMD_HUDSON2_SMBUS	0x780b
>  #define PCI_DEVICE_ID_AMD_CS5535_IDE    0x208F
>  #define PCI_DEVICE_ID_AMD_CS5536_ISA    0x2090
>  #define PCI_DEVICE_ID_AMD_CS5536_FLASH  0x2091
> @@ -570,6 +569,7 @@
>  #define PCI_DEVICE_ID_AMD_LX_AES    0x2082
>  #define PCI_DEVICE_ID_AMD_HUDSON2_IDE		0x780c
>  #define PCI_DEVICE_ID_AMD_HUDSON2_SATA_IDE	0x7800
> +#define PCI_DEVICE_ID_AMD_HUDSON2_SMBUS		0x780b
>  
>  #define PCI_VENDOR_ID_TRIDENT		0x1023
>  #define PCI_DEVICE_ID_TRIDENT_4DWAVE_DX	0x2000

Acked-by: Jean Delvare <khali@linux-fr.org>
diff mbox

Patch

diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index c129162..e0b5623 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -556,7 +556,6 @@ 
 #define PCI_DEVICE_ID_AMD_8131_BRIDGE	0x7450
 #define PCI_DEVICE_ID_AMD_8131_APIC	0x7451
 #define PCI_DEVICE_ID_AMD_8132_BRIDGE	0x7458
-#define PCI_DEVICE_ID_AMD_HUDSON2_SMBUS	0x780b
 #define PCI_DEVICE_ID_AMD_CS5535_IDE    0x208F
 #define PCI_DEVICE_ID_AMD_CS5536_ISA    0x2090
 #define PCI_DEVICE_ID_AMD_CS5536_FLASH  0x2091
@@ -570,6 +569,7 @@ 
 #define PCI_DEVICE_ID_AMD_LX_AES    0x2082
 #define PCI_DEVICE_ID_AMD_HUDSON2_IDE		0x780c
 #define PCI_DEVICE_ID_AMD_HUDSON2_SATA_IDE	0x7800
+#define PCI_DEVICE_ID_AMD_HUDSON2_SMBUS		0x780b
 
 #define PCI_VENDOR_ID_TRIDENT		0x1023
 #define PCI_DEVICE_ID_TRIDENT_4DWAVE_DX	0x2000