diff options
author | Paul Mackerras <paulus@samba.org> | 2008-02-26 21:08:45 +1100 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-02-26 21:08:45 +1100 |
commit | f8303dd3db57bd7ab2062985ad7a9e898a8ac423 (patch) | |
tree | b92086100ed44c8647dba61a21e560923daa336a /include/asm-powerpc/abs_addr.h | |
parent | bfa274e2436fc7ef72ef51c878083647f1cfd429 (diff) | |
parent | 74b20dad1c4cc0fd13ceca62fbab808919e1a7ea (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/lmb-2.6
Diffstat (limited to 'include/asm-powerpc/abs_addr.h')
-rw-r--r-- | include/asm-powerpc/abs_addr.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-powerpc/abs_addr.h b/include/asm-powerpc/abs_addr.h index 4aa220718b1..98324c5a828 100644 --- a/include/asm-powerpc/abs_addr.h +++ b/include/asm-powerpc/abs_addr.h @@ -12,10 +12,11 @@ * 2 of the License, or (at your option) any later version. */ +#include <linux/lmb.h> + #include <asm/types.h> #include <asm/page.h> #include <asm/prom.h> -#include <asm/lmb.h> #include <asm/firmware.h> struct mschunks_map { |