diff --git a/[refs] b/[refs]
index 1d6e1eac882f..5c7304496255 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5bfc82652ab913606c91d74f7337cbd94627a797
+refs/heads/master: bcdd1ea350feb7ee28d4f425c312e9fdf681acfb
diff --git a/trunk/arch/ppc/oprofile/Kconfig b/trunk/arch/powerpc/oprofile/Kconfig
similarity index 100%
rename from trunk/arch/ppc/oprofile/Kconfig
rename to trunk/arch/powerpc/oprofile/Kconfig
diff --git a/trunk/arch/ppc/Kconfig b/trunk/arch/ppc/Kconfig
index f9285210475f..ed9c9727d75f 100644
--- a/trunk/arch/ppc/Kconfig
+++ b/trunk/arch/ppc/Kconfig
@@ -1368,7 +1368,7 @@ endmenu
 
 source "lib/Kconfig"
 
-source "arch/ppc/oprofile/Kconfig"
+source "arch/powerpc/oprofile/Kconfig"
 
 source "arch/ppc/Kconfig.debug"
 
diff --git a/trunk/arch/ppc64/Kconfig b/trunk/arch/ppc64/Kconfig
index c658650af429..32951bfc7f65 100644
--- a/trunk/arch/ppc64/Kconfig
+++ b/trunk/arch/ppc64/Kconfig
@@ -461,7 +461,7 @@ config VIOPATH
 	depends on VIOCONS || VIODASD || VIOCD || VIOTAPE || VETH
 	default y
 
-source "arch/ppc64/oprofile/Kconfig"
+source "arch/powerpc/oprofile/Kconfig"
 
 source "arch/ppc64/Kconfig.debug"
 
diff --git a/trunk/arch/ppc64/oprofile/Kconfig b/trunk/arch/ppc64/oprofile/Kconfig
deleted file mode 100644
index 5ade19801b97..000000000000
--- a/trunk/arch/ppc64/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
-