diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-11-07 19:14:20 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-11-07 19:14:20 -0500 |
| commit | 24bfb00123e82a2e70bd115277d922438813515b (patch) | |
| tree | 27328b8a5718e16d64e2d101f4b7ddcad5930aed /arch/um/include/mem_user.h | |
| parent | c6135234550ed89a6fd0e8cb229633967e41d649 (diff) | |
| parent | 3f00d3e8fb963968a922d821a9a53b503b687e81 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'arch/um/include/mem_user.h')
| -rw-r--r-- | arch/um/include/mem_user.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/include/mem_user.h b/arch/um/include/mem_user.h index 9fef4123a65a..a1064c5823bf 100644 --- a/arch/um/include/mem_user.h +++ b/arch/um/include/mem_user.h | |||
| @@ -57,7 +57,7 @@ extern int init_maps(unsigned long physmem, unsigned long iomem, | |||
| 57 | unsigned long highmem); | 57 | unsigned long highmem); |
| 58 | extern unsigned long get_vm(unsigned long len); | 58 | extern unsigned long get_vm(unsigned long len); |
| 59 | extern void setup_physmem(unsigned long start, unsigned long usable, | 59 | extern void setup_physmem(unsigned long start, unsigned long usable, |
| 60 | unsigned long len, unsigned long highmem); | 60 | unsigned long len, unsigned long long highmem); |
| 61 | extern void add_iomem(char *name, int fd, unsigned long size); | 61 | extern void add_iomem(char *name, int fd, unsigned long size); |
| 62 | extern unsigned long phys_offset(unsigned long phys); | 62 | extern unsigned long phys_offset(unsigned long phys); |
| 63 | extern void unmap_physmem(void); | 63 | extern void unmap_physmem(void); |