diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-18 22:14:39 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-18 22:14:39 -0400 |
| commit | a3bc068022b968a3042b48eb9a8e8b0418fb9cdd (patch) | |
| tree | 6bbc2806756924105802f4584157396fb98d282c /include/asm-i386 | |
| parent | 54cfb5aa0f4859bd38706eabe0118175780a542f (diff) | |
| parent | 91aa9fb573fcc50bc74d5ee64c7e9b36131f1804 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'include/asm-i386')
| -rw-r--r-- | include/asm-i386/pci.h | 4 | ||||
| -rw-r--r-- | include/asm-i386/processor.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/asm-i386/pci.h b/include/asm-i386/pci.h index 2cbab30734d..78c85985aee 100644 --- a/include/asm-i386/pci.h +++ b/include/asm-i386/pci.h @@ -18,9 +18,11 @@ extern unsigned int pcibios_assign_all_busses(void); #define pcibios_scan_all_fns(a, b) 0 extern unsigned long pci_mem_start; -#define PCIBIOS_MIN_IO 0x4000 +#define PCIBIOS_MIN_IO 0x1000 #define PCIBIOS_MIN_MEM (pci_mem_start) +#define PCIBIOS_MIN_CARDBUS_IO 0x4000 + void pcibios_config_init(void); struct pci_bus * pcibios_scan_root(int bus); diff --git a/include/asm-i386/processor.h b/include/asm-i386/processor.h index 5d06e6bd6ba..d0d8b016009 100644 --- a/include/asm-i386/processor.h +++ b/include/asm-i386/processor.h @@ -29,7 +29,7 @@ struct desc_struct { }; #define desc_empty(desc) \ - (!((desc)->a + (desc)->b)) + (!((desc)->a | (desc)->b)) #define desc_equal(desc1, desc2) \ (((desc1)->a == (desc2)->a) && ((desc1)->b == (desc2)->b)) |