diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-10 09:09:51 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-10 09:09:51 +0200 |
| commit | 6003ab0bad4cc56f3c4fadf62a0d23a967b9c53b (patch) | |
| tree | 2087ca69776116b70a6af0daae9c10bfac1aa347 /arch/blackfin/include/asm/Kbuild | |
| parent | debug: add notifier chain debugging, v2 (diff) | |
| parent | Linux 2.6.27-rc6 (diff) | |
| download | linux-6003ab0bad4cc56f3c4fadf62a0d23a967b9c53b.tar.xz linux-6003ab0bad4cc56f3c4fadf62a0d23a967b9c53b.zip | |
Merge branch 'linus' into core/debug
Conflicts:
lib/vsprintf.c
Manual merge:
include/linux/kernel.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/blackfin/include/asm/Kbuild')
| -rw-r--r-- | arch/blackfin/include/asm/Kbuild | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/blackfin/include/asm/Kbuild b/arch/blackfin/include/asm/Kbuild new file mode 100644 index 000000000000..606ecfdcc962 --- /dev/null +++ b/arch/blackfin/include/asm/Kbuild @@ -0,0 +1,3 @@ +include include/asm-generic/Kbuild.asm + +unifdef-y += fixed_code.h |