diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-06-11 23:04:37 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-06-11 23:04:37 -0400 |
| commit | fec69a97489f961026e24536dbb7b86ac663948c (patch) | |
| tree | 869713470d81ebc261598489a2711960336c7c37 /include/linux/mempolicy.h | |
| parent | 1049cb478783c74ca8c99ef70e7d2bf920b9335b (diff) | |
| parent | 2f9719b61e1fcf7422a016ac4f2420a0cc6ba320 (diff) | |
Merge branch 'upstream-fixes' into upstream
Conflicts:
drivers/scsi/sata_sil24.c
Diffstat (limited to 'include/linux/mempolicy.h')
| -rw-r--r-- | include/linux/mempolicy.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/mempolicy.h b/include/linux/mempolicy.h index 6a7621b2b12b..f5fdca1d67e6 100644 --- a/include/linux/mempolicy.h +++ b/include/linux/mempolicy.h | |||
| @@ -36,6 +36,7 @@ | |||
| 36 | #include <linux/nodemask.h> | 36 | #include <linux/nodemask.h> |
| 37 | 37 | ||
| 38 | struct vm_area_struct; | 38 | struct vm_area_struct; |
| 39 | struct mm_struct; | ||
| 39 | 40 | ||
| 40 | #ifdef CONFIG_NUMA | 41 | #ifdef CONFIG_NUMA |
| 41 | 42 | ||