From 552b1439945f590f8e525d13ffbd286d0ec6a475 Mon Sep 17 00:00:00 2001
From: =?utf8?q?=E7=BD=97=E4=BC=9F?= <lw@rock-chips.com>
Date: Mon, 17 May 2010 09:09:37 +0000
Subject: [PATCH] modify rk2818 adc

---
 arch/arm/mach-rk2818/Kconfig                       |  6 ++++++
 arch/arm/mach-rk2818/Makefile                      |  2 +-
 .../rk2818 => arch/arm/mach-rk2818}/rk2818_adc.c   |  2 +-
 drivers/staging/rk2818/Kconfig                     | 14 --------------
 drivers/staging/rk2818/Makefile                    |  1 -
 5 files changed, 8 insertions(+), 17 deletions(-)
 rename {drivers/staging/rk2818 => arch/arm/mach-rk2818}/rk2818_adc.c (99%)
 delete mode 100644 drivers/staging/rk2818/Kconfig
 delete mode 100644 drivers/staging/rk2818/Makefile

diff --git a/arch/arm/mach-rk2818/Kconfig b/arch/arm/mach-rk2818/Kconfig
index bd9c54ee6dcb..9f58c46226fa 100644
--- a/arch/arm/mach-rk2818/Kconfig
+++ b/arch/arm/mach-rk2818/Kconfig
@@ -14,4 +14,10 @@ config RK28_GPIO_IRQ
 	int
 	default 16 if ARCH_RK2818	
 	default 0	
+config RK28_ADC
+	tristate "RK28 ADC Driver"
+	depends on ARCH_RK2818
+	default y
+	---help---
+		RK28 ADC Driver
 endif
diff --git a/arch/arm/mach-rk2818/Makefile b/arch/arm/mach-rk2818/Makefile
index fba92e1e558d..1cdfa6916f63 100644
--- a/arch/arm/mach-rk2818/Makefile
+++ b/arch/arm/mach-rk2818/Makefile
@@ -5,6 +5,6 @@ obj-y += vreg.o
 obj-y += clock.o
 obj-$(CONFIG_CPU_FREQ) += cpufreq.o
 obj-y += dma.o
-
+obj-$(CONFIG_RK28_ADC) += rk2818_adc.o
 obj-$(CONFIG_MACH_RK2818MID) += board-midsdk.o
 
diff --git a/drivers/staging/rk2818/rk2818_adc.c b/arch/arm/mach-rk2818/rk2818_adc.c
similarity index 99%
rename from drivers/staging/rk2818/rk2818_adc.c
rename to arch/arm/mach-rk2818/rk2818_adc.c
index e953e447a316..4cf6e5d43811 100644
--- a/drivers/staging/rk2818/rk2818_adc.c
+++ b/arch/arm/mach-rk2818/rk2818_adc.c
@@ -1,4 +1,4 @@
-/* arch/staging/rk2818/rk2818_adc.c
+/* drivers/staging/rk2818/rk2818_adc.c
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/drivers/staging/rk2818/Kconfig b/drivers/staging/rk2818/Kconfig
deleted file mode 100644
index 558c75a37d82..000000000000
--- a/drivers/staging/rk2818/Kconfig
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# RK28XX ADC configuration
-#
-menuconfig RK28
-	tristate "RK28 Staging Driver"
-	depends on ARCH_RK2818
-	
-if RK28
-config RK28_ADC
-	tristate "RK28 ADC Driver"
-	default y
-	---help---
-		RK28 ADC Driver
-endif #RK28
diff --git a/drivers/staging/rk2818/Makefile b/drivers/staging/rk2818/Makefile
deleted file mode 100644
index 632089443594..000000000000
--- a/drivers/staging/rk2818/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-obj-$(CONFIG_RK28_ADC) += rk2818_adc.o
-- 
2.34.1