Patchwork [3/6] wdt_i6300esb: move PCI_DEVICE_IDE_INTEL_ESB_9 to pci_ids.h

login
register
mail settings
Submitter Juan Quintela
Date Oct. 14, 2009, 11:39 p.m.
Message ID <ec4b260cf0485e56d4a76ba3ee64098bb93fe2a5.1255563370.git.quintela@redhat.com>
Download mbox | patch
Permalink /patch/36033/
State New
Headers show

Comments

Juan Quintela - Oct. 14, 2009, 11:39 p.m.
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 hw/pci_ids.h      |    1 +
 hw/wdt_i6300esb.c |    4 ----
 2 files changed, 1 insertions(+), 4 deletions(-)
Richard W.M. Jones - Oct. 15, 2009, 8:40 a.m.
On Thu, Oct 15, 2009 at 01:39:59AM +0200, Juan Quintela wrote:
> 
> Signed-off-by: Juan Quintela <quintela@redhat.com>
> ---
>  hw/pci_ids.h      |    1 +
>  hw/wdt_i6300esb.c |    4 ----
>  2 files changed, 1 insertions(+), 4 deletions(-)
> 
> diff --git a/hw/pci_ids.h b/hw/pci_ids.h
> index 3afe674..63379c2 100644
> --- a/hw/pci_ids.h
> +++ b/hw/pci_ids.h
> @@ -88,6 +88,7 @@
>  #define PCI_VENDOR_ID_INTEL              0x8086
>  #define PCI_DEVICE_ID_INTEL_82441        0x1237
>  #define PCI_DEVICE_ID_INTEL_82801AA_5    0x2415
> +#define PCI_DEVICE_ID_INTEL_ESB_9        0x25ab
>  #define PCI_DEVICE_ID_INTEL_82371SB_0    0x7000
>  #define PCI_DEVICE_ID_INTEL_82371SB_1    0x7010
>  #define PCI_DEVICE_ID_INTEL_82371SB_2    0x7020
> diff --git a/hw/wdt_i6300esb.c b/hw/wdt_i6300esb.c
> index 3d920ea..40081ca 100644
> --- a/hw/wdt_i6300esb.c
> +++ b/hw/wdt_i6300esb.c
> @@ -36,10 +36,6 @@
>  #define i6300esb_debug(fs,...)
>  #endif
> 
> -#ifndef PCI_DEVICE_ID_INTEL_ESB_9
> -#define PCI_DEVICE_ID_INTEL_ESB_9 0x25ab
> -#endif
> -
>  /* PCI configuration registers */
>  #define ESB_CONFIG_REG  0x60            /* Config register                   */
>  #define ESB_LOCK_REG    0x68            /* WDT lock register                 */
> -- 
> 1.6.2.5

Ah ha, yes, I was looking for the proper place to put that define
(I thought it was in a Linux / system header file).

ACK.

Rich.

Patch

diff --git a/hw/pci_ids.h b/hw/pci_ids.h
index 3afe674..63379c2 100644
--- a/hw/pci_ids.h
+++ b/hw/pci_ids.h
@@ -88,6 +88,7 @@ 
 #define PCI_VENDOR_ID_INTEL              0x8086
 #define PCI_DEVICE_ID_INTEL_82441        0x1237
 #define PCI_DEVICE_ID_INTEL_82801AA_5    0x2415
+#define PCI_DEVICE_ID_INTEL_ESB_9        0x25ab
 #define PCI_DEVICE_ID_INTEL_82371SB_0    0x7000
 #define PCI_DEVICE_ID_INTEL_82371SB_1    0x7010
 #define PCI_DEVICE_ID_INTEL_82371SB_2    0x7020
diff --git a/hw/wdt_i6300esb.c b/hw/wdt_i6300esb.c
index 3d920ea..40081ca 100644
--- a/hw/wdt_i6300esb.c
+++ b/hw/wdt_i6300esb.c
@@ -36,10 +36,6 @@ 
 #define i6300esb_debug(fs,...)
 #endif

-#ifndef PCI_DEVICE_ID_INTEL_ESB_9
-#define PCI_DEVICE_ID_INTEL_ESB_9 0x25ab
-#endif
-
 /* PCI configuration registers */
 #define ESB_CONFIG_REG  0x60            /* Config register                   */
 #define ESB_LOCK_REG    0x68            /* WDT lock register                 */