diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-11 11:50:22 +0100 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-11 11:50:22 +0100 |
commit | f85272a97825d4a67098a8ad70fa5efb55e4847a (patch) | |
tree | e55b38e21b45213269057417032db4440e8f5eed /include/asm-ppc64/pci-bridge.h | |
parent | [PATCH] libata.h needs dma-mapping.h (diff) | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 (diff) | |
download | linux-f85272a97825d4a67098a8ad70fa5efb55e4847a.tar.xz linux-f85272a97825d4a67098a8ad70fa5efb55e4847a.zip |
Merge branch 'master'
Diffstat (limited to '')
-rw-r--r-- | include/asm-ppc64/pci-bridge.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-ppc64/pci-bridge.h b/include/asm-ppc64/pci-bridge.h index 60cf8c838af0..efbdaece0cf0 100644 --- a/include/asm-ppc64/pci-bridge.h +++ b/include/asm-ppc64/pci-bridge.h @@ -63,7 +63,6 @@ struct pci_dn { int devfn; /* for pci devices */ int eeh_mode; /* See eeh.h for possible EEH_MODEs */ int eeh_config_addr; - int eeh_capable; /* from firmware */ int eeh_check_count; /* # times driver ignored error */ int eeh_freeze_count; /* # times this device froze up. */ int eeh_is_bridge; /* device is pci-to-pci bridge */ |