diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2007-05-08 01:31:11 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2007-05-08 01:31:11 -0400 |
| commit | 334d0dd8b660557608142f0f77abc6812b48f08b (patch) | |
| tree | 9393a9aa099d7d42deda5f9f5054796c0c769be7 /drivers/parisc/hppb.c | |
| parent | 3f07d8796262f6aee135c8dd9a91210da9f888e4 (diff) | |
| parent | 5b94f675f57e4ff16c8fda09088d7480a84dcd91 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/parisc/hppb.c')
| -rw-r--r-- | drivers/parisc/hppb.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/parisc/hppb.c b/drivers/parisc/hppb.c index 9bb4db552f3c..a68b3b3761a2 100644 --- a/drivers/parisc/hppb.c +++ b/drivers/parisc/hppb.c | |||
| @@ -22,8 +22,6 @@ | |||
| 22 | #include <asm/hardware.h> | 22 | #include <asm/hardware.h> |
| 23 | #include <asm/parisc-device.h> | 23 | #include <asm/parisc-device.h> |
| 24 | 24 | ||
| 25 | #include <linux/pci.h> | ||
| 26 | |||
| 27 | struct hppb_card { | 25 | struct hppb_card { |
| 28 | unsigned long hpa; | 26 | unsigned long hpa; |
| 29 | struct resource mmio_region; | 27 | struct resource mmio_region; |