git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
arch
/
xtensa
/
kernel
/
coprocessor.S
diff --git
a/arch/xtensa/kernel/coprocessor.S
b/arch/xtensa/kernel/coprocessor.S
index
356192a
..
01bcb9f
100644
(file)
--- a/
arch/xtensa/kernel/coprocessor.S
+++ b/
arch/xtensa/kernel/coprocessor.S
@@
-24,7
+24,6
@@
* assigned when the Xtensa processor is generated.
*/
* assigned when the Xtensa processor is generated.
*/
-#include <linux/config.h>
#include <linux/linkage.h>
#include <asm/processor.h>
#include <linux/linkage.h>
#include <asm/processor.h>
@@
-91,7
+90,6
@@
ENTRY(enable_coprocessor)
rsync
retw
rsync
retw
-#endif
ENTRY(save_coprocessor_extra)
entry sp, 16
ENTRY(save_coprocessor_extra)
entry sp, 16
@@
-198,4
+196,5
@@
_xtensa_reginfo_tables:
XCHAL_CP7_SA_CONTENTS_LIBDB
.word 0xFC000000 /* invalid register number,marks end of table*/
_xtensa_reginfo_table_end:
XCHAL_CP7_SA_CONTENTS_LIBDB
.word 0xFC000000 /* invalid register number,marks end of table*/
_xtensa_reginfo_table_end:
+#endif