diff options
| author | David S. Miller <davem@davemloft.net> | 2009-06-15 06:02:23 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-06-15 06:02:23 -0400 |
| commit | 9cbc1cb8cd46ce1f7645b9de249b2ce8460129bb (patch) | |
| tree | 8d104ec2a459346b99413b0b77421ca7b9936c1a /arch/alpha/include/asm/page.h | |
| parent | ca44d6e60f9de26281fda203f58b570e1748c015 (diff) | |
| parent | 45e3e1935e2857c54783291107d33323b3ef33c8 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/scsi/fcoe/fcoe.c
net/core/drop_monitor.c
net/core/net-traces.c
Diffstat (limited to 'arch/alpha/include/asm/page.h')
| -rw-r--r-- | arch/alpha/include/asm/page.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/alpha/include/asm/page.h b/arch/alpha/include/asm/page.h index 0995f9d13417..07af062544fb 100644 --- a/arch/alpha/include/asm/page.h +++ b/arch/alpha/include/asm/page.h | |||
| @@ -93,6 +93,6 @@ typedef struct page *pgtable_t; | |||
| 93 | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) | 93 | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) |
| 94 | 94 | ||
| 95 | #include <asm-generic/memory_model.h> | 95 | #include <asm-generic/memory_model.h> |
| 96 | #include <asm-generic/page.h> | 96 | #include <asm-generic/getorder.h> |
| 97 | 97 | ||
| 98 | #endif /* _ALPHA_PAGE_H */ | 98 | #endif /* _ALPHA_PAGE_H */ |