diff options
| author |   Jiri Kosina <jkosina@suse.cz> | 2012-04-08 21:48:52 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2012-04-08 21:48:52 +0200 |
| commit | e75d660672ddd11704b7f0fdb8ff21968587b266 (patch) | |
| tree | ccb9c107744c10b553c0373e450bee3971d16c00 /arch/ia64/kernel/gate.lds.S | |
| parent | atm: fix comments (diff) | |
| parent | Linux 3.4-rc2 (diff) | |
| download | linux-dev-e75d660672ddd11704b7f0fdb8ff21968587b266.tar.xz linux-dev-e75d660672ddd11704b7f0fdb8ff21968587b266.zip | |
Merge branch 'master' into for-next
Merge with latest Linus' tree, as I have incoming patches
that fix code that is newer than current HEAD of for-next.
Conflicts:
drivers/net/ethernet/realtek/r8169.c
Diffstat (limited to 'arch/ia64/kernel/gate.lds.S')
| -rw-r--r-- | arch/ia64/kernel/gate.lds.S | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/ia64/kernel/gate.lds.S b/arch/ia64/kernel/gate.lds.S index d32b0855110a..e518f7902af6 100644 --- a/arch/ia64/kernel/gate.lds.S +++ b/arch/ia64/kernel/gate.lds.S @@ -5,8 +5,7 @@ * its layout. */ - -#include <asm/system.h> +#include <asm/page.h> #include "paravirt_patchlist.h" SECTIONS |