diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-08-23 05:43:14 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-08-23 05:43:14 -0400 |
| commit | ac0c955d5048c2c580fa7166a89133f0fd76c125 (patch) | |
| tree | 041ac4fb544c7244a1a0b35c8ceabc142d5645c1 /drivers/lguest/lguest_bus.c | |
| parent | 68d09b1b6780415d82160f6b6d88e82bd724e691 (diff) | |
| parent | b377fd3982ad957c796758a90e2988401a884241 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/lguest/lguest_bus.c')
| -rw-r--r-- | drivers/lguest/lguest_bus.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/lguest/lguest_bus.c b/drivers/lguest/lguest_bus.c index 55a7940ca732..9e7752cc8002 100644 --- a/drivers/lguest/lguest_bus.c +++ b/drivers/lguest/lguest_bus.c | |||
| @@ -5,6 +5,7 @@ | |||
| 5 | #include <linux/bootmem.h> | 5 | #include <linux/bootmem.h> |
| 6 | #include <linux/lguest_bus.h> | 6 | #include <linux/lguest_bus.h> |
| 7 | #include <asm/io.h> | 7 | #include <asm/io.h> |
| 8 | #include <asm/paravirt.h> | ||
| 8 | 9 | ||
| 9 | static ssize_t type_show(struct device *_dev, | 10 | static ssize_t type_show(struct device *_dev, |
| 10 | struct device_attribute *attr, char *buf) | 11 | struct device_attribute *attr, char *buf) |