ia64/xen-unstable

changeset 19256:4dac26349877

xen, pci: Fix the definition of PCI_PM_CTRL_NO_SOFT_RESET.

Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
author Keir Fraser <keir.fraser@citrix.com>
date Mon Mar 02 11:01:06 2009 +0000 (2009-03-02)
parents c9e9602cc080
children 5e34a8966251
files xen/include/asm-ia64/linux/pci_regs.h xen/include/xen/pci_regs.h
line diff
     1.1 --- a/xen/include/asm-ia64/linux/pci_regs.h	Mon Mar 02 10:52:07 2009 +0000
     1.2 +++ b/xen/include/asm-ia64/linux/pci_regs.h	Mon Mar 02 11:01:06 2009 +0000
     1.3 @@ -229,7 +229,7 @@
     1.4  #define  PCI_PM_CAP_PME_D3cold	0x8000	/* PME# from D3 (cold) */
     1.5  #define PCI_PM_CTRL		4	/* PM control and status register */
     1.6  #define  PCI_PM_CTRL_STATE_MASK	0x0003	/* Current power state (D0 to D3) */
     1.7 -#define  PCI_PM_CTRL_NO_SOFT_RESET	0x0004	/* No reset for D3hot->D0 */
     1.8 +#define  PCI_PM_CTRL_NO_SOFT_RESET	0x0008	/* No reset for D3hot->D0 */
     1.9  #define  PCI_PM_CTRL_PME_ENABLE	0x0100	/* PME pin enable */
    1.10  #define  PCI_PM_CTRL_DATA_SEL_MASK	0x1e00	/* Data select (??) */
    1.11  #define  PCI_PM_CTRL_DATA_SCALE_MASK	0x6000	/* Data scale (??) */
     2.1 --- a/xen/include/xen/pci_regs.h	Mon Mar 02 10:52:07 2009 +0000
     2.2 +++ b/xen/include/xen/pci_regs.h	Mon Mar 02 11:01:06 2009 +0000
     2.3 @@ -233,7 +233,7 @@
     2.4  #define  PCI_PM_CAP_PME_D3cold	0x8000	/* PME# from D3 (cold) */
     2.5  #define PCI_PM_CTRL		4	/* PM control and status register */
     2.6  #define  PCI_PM_CTRL_STATE_MASK	0x0003	/* Current power state (D0 to D3) */
     2.7 -#define  PCI_PM_CTRL_NO_SOFT_RESET	0x0004	/* No reset for D3hot->D0 */
     2.8 +#define  PCI_PM_CTRL_NO_SOFT_RESET	0x0008	/* No reset for D3hot->D0 */
     2.9  #define  PCI_PM_CTRL_PME_ENABLE	0x0100	/* PME pin enable */
    2.10  #define  PCI_PM_CTRL_DATA_SEL_MASK	0x1e00	/* Data select (??) */
    2.11  #define  PCI_PM_CTRL_DATA_SCALE_MASK	0x6000	/* Data scale (??) */