diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-04 16:36:52 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-04 16:36:52 -0800 |
| commit | 25c862cc9ea9b312c25a9f577f91b973131f1261 (patch) | |
| tree | 8e8f56531144370ced50fa98db2973f4e93e38b0 /include | |
| parent | 52347f4e810ba323d02cd2c26b5d738f4a2c3d5e (diff) | |
| parent | 8ded4ac018ea706bf7ee926601a27184665c9c28 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-mips/.gitignore | 1 | ||||
| -rw-r--r-- | include/linux/spinlock.h | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/include/asm-mips/.gitignore b/include/asm-mips/.gitignore deleted file mode 100644 index 4ec57ad5bc3c..000000000000 --- a/include/asm-mips/.gitignore +++ /dev/null @@ -1 +0,0 @@ -asm_offsets.h diff --git a/include/linux/spinlock.h b/include/linux/spinlock.h index 0e9682c9def5..799be6747944 100644 --- a/include/linux/spinlock.h +++ b/include/linux/spinlock.h @@ -59,8 +59,7 @@ /* * Must define these before including other files, inline functions need them */ -#define LOCK_SECTION_NAME \ - ".text.lock." __stringify(KBUILD_BASENAME) +#define LOCK_SECTION_NAME ".text.lock."KBUILD_BASENAME #define LOCK_SECTION_START(extra) \ ".subsection 1\n\t" \ |