git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linus' into x86/i8259
[sfrench/cifs-2.6.git]
/
arch
/
parisc
/
kernel
/
hpmc.S
diff --git
a/arch/parisc/kernel/hpmc.S
b/arch/parisc/kernel/hpmc.S
index 068322eb8c9bf3f49ad51ea7a36c9f75aff17e8c..2cbf13b3ef11d0a1ff62f7eb5cec9b1c96333371 100644
(file)
--- 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)