misc: rk_scr: change config placement

to make merge happy

Change-Id: I7f7d16f2f471c34736f28d702c38a733fce95cd3
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>

diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index b57ed5bbc7c665a59f46462302de24101fa010b8..2006cddc614fc186a02bbf82239934d99b7f84b9 100644 (file)
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -4,6 +4,13 @@
 
 menu "Misc devices"
 
+config ROCKCHIP_SCR
+       tristate "Rockchip Smartcard Reader Controller support"
+       default n
+       help
+         say Y here to enable Rockchip Smartcard Reader Controller driver
+         for Soc such as RK3128,RK322x,RK3288,RK3368,RK3366 and etc.
+
 config SENSORS_LIS3LV02D
        tristate
        depends on INPUT
@@ -531,13 +538,6 @@ config UID_CPUTIME
        help
          Per UID based cpu time statistics exported to /proc/uid_cputime
 
-config ROCKCHIP_SCR
-       tristate "Rockchip Smartcard Reader Controller support"
-       default n
-       help
-         say Y here to enable Rockchip Smartcard Reader Controller driver
-         for Soc such as RK3128,RK322x,RK3288,RK3368,RK3366 and etc.
-
 source "drivers/misc/c2port/Kconfig"
 source "drivers/misc/eeprom/Kconfig"
 source "drivers/misc/cb710/Kconfig"

diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
index 784023f342c926f706ca7f21998ebcd417038b73..48688403593b4eb02416050be7dd05514e5340d5 100644 (file)
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@ -2,6 +2,7 @@
 # Makefile for misc devices that really don't fit anywhere else.
 #
 
+obj-$(CONFIG_ROCKCHIP_SCR)     += rk_scr.o
 obj-$(CONFIG_IBM_ASM)          += ibmasm/
 obj-$(CONFIG_AD525X_DPOT)      += ad525x_dpot.o
 obj-$(CONFIG_AD525X_DPOT_I2C)  += ad525x_dpot-i2c.o
@@ -57,4 +58,3 @@ obj-$(CONFIG_ECHO)            += echo/
 obj-$(CONFIG_VEXPRESS_SYSCFG)  += vexpress-syscfg.o
 obj-$(CONFIG_CXL_BASE)         += cxl/
 obj-$(CONFIG_UID_CPUTIME) += uid_cputime.o
-obj-$(CONFIG_ROCKCHIP_SCR)     += rk_scr.o