diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-06-16 06:53:25 +0200 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-06-16 06:53:25 +0200 |
| commit | a9653cf540d407fb75deb3db65a1be6c81d53ee0 (patch) | |
| tree | 075fb79746f1d74443c9a9062e73c26a6266b05c /arch/parisc/kernel/hpmc.S | |
| parent | Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/jk/spuf... (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 (diff) | |
| download | linux-a9653cf540d407fb75deb3db65a1be6c81d53ee0.tar.xz linux-a9653cf540d407fb75deb3db65a1be6c81d53ee0.zip | |
Merge branch 'linux-2.6' into merge
Diffstat (limited to 'arch/parisc/kernel/hpmc.S')
| -rw-r--r-- | arch/parisc/kernel/hpmc.S | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/parisc/kernel/hpmc.S b/arch/parisc/kernel/hpmc.S index 068322eb8c9b..2cbf13b3ef11 100644 --- a/arch/parisc/kernel/hpmc.S +++ b/arch/parisc/kernel/hpmc.S @@ -47,7 +47,6 @@ #include <asm/pdc.h> #include <linux/linkage.h> -#include <linux/init.h> /* * stack for os_hpmc, the HPMC handler. @@ -77,7 +76,7 @@ ENTRY(hpmc_pim_data) .block HPMC_PIM_DATA_SIZE END(hpmc_pim_data) - __HEAD + .text .import intr_save, code ENTRY(os_hpmc) |