diff options
| author | Len Brown <len.brown@intel.com> | 2005-09-08 01:45:47 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-09-08 01:45:47 -0400 |
| commit | 64e47488c913ac704d465a6af86a26786d1412a5 (patch) | |
| tree | d3b0148592963dcde26e4bb35ddfec8b1eaf8e23 /include/asm-xtensa/page.h | |
| parent | 4a35a46bf1cda4737c428380d1db5d15e2590d18 (diff) | |
| parent | caf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff) | |
Merge linux-2.6 with linux-acpi-2.6
Diffstat (limited to 'include/asm-xtensa/page.h')
| -rw-r--r-- | include/asm-xtensa/page.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-xtensa/page.h b/include/asm-xtensa/page.h index b495e5b5a942..8ded36f255a2 100644 --- a/include/asm-xtensa/page.h +++ b/include/asm-xtensa/page.h | |||
| @@ -55,7 +55,7 @@ typedef struct { unsigned long pgprot; } pgprot_t; | |||
| 55 | * Pure 2^n version of get_order | 55 | * Pure 2^n version of get_order |
| 56 | */ | 56 | */ |
| 57 | 57 | ||
| 58 | extern __inline__ int get_order(unsigned long size) | 58 | static inline int get_order(unsigned long size) |
| 59 | { | 59 | { |
| 60 | int order; | 60 | int order; |
| 61 | #ifndef XCHAL_HAVE_NSU | 61 | #ifndef XCHAL_HAVE_NSU |