diff options
| author | Dave Kleikamp <shaggy@kleikamp.(none)> | 2005-05-04 17:43:30 -0400 |
|---|---|---|
| committer | Dave Kleikamp <shaggy@kleikamp.(none)> | 2005-05-04 17:43:30 -0400 |
| commit | ddf3e298b33f3e15a2e6272e0146dfa940c89a74 (patch) | |
| tree | cd474d1eca4f337958e97a09dcb0974b1f8aba82 /drivers/pci/probe.c | |
| parent | 7a694ca74958b97ae2d437c8a730bddd9e9792c3 (diff) | |
| parent | 1d42a0ecf478962e8aede355a0be41365c117ff0 (diff) | |
Merge with /home/shaggy/git/linus-clean/
Diffstat (limited to 'drivers/pci/probe.c')
| -rw-r--r-- | drivers/pci/probe.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 6f0edadd132c..b7ae87823c69 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c | |||
| @@ -9,6 +9,7 @@ | |||
| 9 | #include <linux/slab.h> | 9 | #include <linux/slab.h> |
| 10 | #include <linux/module.h> | 10 | #include <linux/module.h> |
| 11 | #include <linux/cpumask.h> | 11 | #include <linux/cpumask.h> |
| 12 | #include "pci.h" | ||
| 12 | 13 | ||
| 13 | #define CARDBUS_LATENCY_TIMER 176 /* secondary latency timer */ | 14 | #define CARDBUS_LATENCY_TIMER 176 /* secondary latency timer */ |
| 14 | #define CARDBUS_RESERVE_BUSNR 3 | 15 | #define CARDBUS_RESERVE_BUSNR 3 |