diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2007-10-12 21:27:47 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2007-10-12 21:27:47 -0400 |
| commit | b981d8b3f5e008ff10d993be633ad00564fc22cd (patch) | |
| tree | e292dc07b22308912cf6a58354a608b9e5e8e1fd /include/asm-mips/fixmap.h | |
| parent | b11d2127c4893a7315d1e16273bc8560049fa3ca (diff) | |
| parent | 2b9e0aae1d50e880c58d46788e5e3ebd89d75d62 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/macintosh/adbhid.c
Diffstat (limited to 'include/asm-mips/fixmap.h')
| -rw-r--r-- | include/asm-mips/fixmap.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-mips/fixmap.h b/include/asm-mips/fixmap.h index 02c8a13fc894..f27b96cfac2e 100644 --- a/include/asm-mips/fixmap.h +++ b/include/asm-mips/fixmap.h | |||
| @@ -60,8 +60,8 @@ enum fixed_addresses { | |||
| 60 | __end_of_fixed_addresses | 60 | __end_of_fixed_addresses |
| 61 | }; | 61 | }; |
| 62 | 62 | ||
| 63 | extern void __set_fixmap (enum fixed_addresses idx, | 63 | extern void __set_fixmap(enum fixed_addresses idx, |
| 64 | unsigned long phys, pgprot_t flags); | 64 | unsigned long phys, pgprot_t flags); |
| 65 | 65 | ||
| 66 | #define set_fixmap(idx, phys) \ | 66 | #define set_fixmap(idx, phys) \ |
| 67 | __set_fixmap(idx, phys, PAGE_KERNEL) | 67 | __set_fixmap(idx, phys, PAGE_KERNEL) |