diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-13 03:28:45 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-13 03:28:45 -0400 |
| commit | 9343af084c7e8911897b0883042ee690cee3aaef (patch) | |
| tree | 6211a4bdc84690bec6530d27a3abb19f5e8bb8f3 /arch/alpha/kernel/pci-sysfs.c | |
| parent | e182c77cc291456eed127b1472952ddb59a81a9d (diff) | |
| parent | 0d0fb0f9c5fddef4a10242fe3337f00f528a3099 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
lib/Kconfig.debug
Diffstat (limited to 'arch/alpha/kernel/pci-sysfs.c')
| -rw-r--r-- | arch/alpha/kernel/pci-sysfs.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/alpha/kernel/pci-sysfs.c b/arch/alpha/kernel/pci-sysfs.c index 6ea822e7f724..d979e7c7bc4b 100644 --- a/arch/alpha/kernel/pci-sysfs.c +++ b/arch/alpha/kernel/pci-sysfs.c | |||
| @@ -10,6 +10,7 @@ | |||
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/sched.h> | 12 | #include <linux/sched.h> |
| 13 | #include <linux/slab.h> | ||
| 13 | #include <linux/pci.h> | 14 | #include <linux/pci.h> |
| 14 | 15 | ||
| 15 | static int hose_mmap_page_range(struct pci_controller *hose, | 16 | static int hose_mmap_page_range(struct pci_controller *hose, |