diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-30 23:55:03 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-30 23:55:03 -0400 |
| commit | e993835441734c184d70d3716eed78a08eeb71c2 (patch) | |
| tree | 583aa17813cdae1c4640e353f8c6df3f197e7548 /drivers/ieee1394/iso.c | |
| parent | 360f654e7cda850034f3f6252a7a7cff3fa77356 (diff) | |
| parent | 1bdfd554be94def718323659173517c5d4a69d25 (diff) | |
| download | kernel_samsung_smdk4412-e993835441734c184d70d3716eed78a08eeb71c2.zip kernel_samsung_smdk4412-e993835441734c184d70d3716eed78a08eeb71c2.tar.gz kernel_samsung_smdk4412-e993835441734c184d70d3716eed78a08eeb71c2.tar.bz2 | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/ieee1394/iso.c')
| -rw-r--r-- | drivers/ieee1394/iso.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/ieee1394/iso.c b/drivers/ieee1394/iso.c index f26680e..08bd15d 100644 --- a/drivers/ieee1394/iso.c +++ b/drivers/ieee1394/iso.c @@ -9,8 +9,11 @@ * directory of the kernel sources for details. */ -#include <linux/slab.h> +#include <linux/pci.h> #include <linux/sched.h> +#include <linux/slab.h> + +#include "hosts.h" #include "iso.h" void hpsb_iso_stop(struct hpsb_iso *iso) |