diff --git a/[refs] b/[refs] index 5ef700d600c7..06b48f4b83b8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6fde836b54f1f0ca3d3c8b7aaf44165a08fe0f9f +refs/heads/master: 62b8e680e61d3f48f2a12ee248ca03ea8f376926 diff --git a/trunk/arch/mn10300/Kconfig b/trunk/arch/mn10300/Kconfig index 41d16822e616..355926730e8d 100644 --- a/trunk/arch/mn10300/Kconfig +++ b/trunk/arch/mn10300/Kconfig @@ -370,5 +370,3 @@ source "security/Kconfig" source "crypto/Kconfig" source "lib/Kconfig" - -source "arch/mn10300/oprofile/Kconfig" diff --git a/trunk/arch/mn10300/oprofile/Kconfig b/trunk/arch/mn10300/oprofile/Kconfig deleted file mode 100644 index 19d37730b664..000000000000 --- a/trunk/arch/mn10300/oprofile/Kconfig +++ /dev/null @@ -1,23 +0,0 @@ - -menu "Profiling support" - depends on EXPERIMENTAL - -config PROFILING - bool "Profiling support (EXPERIMENTAL)" - help - Say Y here to enable the extended profiling support mechanisms used - by profilers such as OProfile. - - -config OPROFILE - tristate "OProfile system profiling (EXPERIMENTAL)" - depends on PROFILING - help - OProfile is a profiling system capable of profiling the - whole system, include the kernel, kernel modules, libraries, - and applications. - - If unsure, say N. - -endmenu -