diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2008-12-31 07:35:57 -0500 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2008-12-31 07:35:57 -0500 |
| commit | 2ca1a615835d9f4990f42102ab1f2ef434e7e89c (patch) | |
| tree | 726cf3d5f29a6c66c44e4bd68e7ebed2fd83d059 /arch/sparc64/oprofile/Makefile | |
| parent | e12f0102ac81d660c9f801d0a0e10ccf4537a9de (diff) | |
| parent | 6a94cb73064c952255336cc57731904174b2c58f (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
arch/x86/kernel/io_apic.c
Diffstat (limited to 'arch/sparc64/oprofile/Makefile')
| -rw-r--r-- | arch/sparc64/oprofile/Makefile | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/arch/sparc64/oprofile/Makefile b/arch/sparc64/oprofile/Makefile deleted file mode 100644 index e9feca1ca28b..000000000000 --- a/arch/sparc64/oprofile/Makefile +++ /dev/null | |||
| @@ -1,9 +0,0 @@ | |||
| 1 | obj-$(CONFIG_OPROFILE) += oprofile.o | ||
| 2 | |||
| 3 | DRIVER_OBJS = $(addprefix ../../../drivers/oprofile/, \ | ||
| 4 | oprof.o cpu_buffer.o buffer_sync.o \ | ||
| 5 | event_buffer.o oprofile_files.o \ | ||
| 6 | oprofilefs.o oprofile_stats.o \ | ||
| 7 | timer_int.o ) | ||
| 8 | |||
| 9 | oprofile-y := $(DRIVER_OBJS) init.o | ||