From: don.hong <don.hong@samsung.com>
Date: Fri, 17 Feb 2012 04:25:39 +0000 (+0900)
Subject: [Title] Modified the name of backlight device as maru_bl
X-Git-Tag: 2.2.1_release^2~176
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=47c255906b6e5dcd1f273ca7749fadff2add3d5d;p=sdk%2Femulator%2Femulator-kernel.git

[Title] Modified the name of backlight device as maru_bl
[Type] Enahncement
[Module] /driver/maru/maru_bl
[Priority]
[Jira#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]

Change-Id: Ib4fd320af7dd2f529c3210c10d74883b993df0dc
---

diff --git a/arch/x86/configs/i386_emul_defconfig b/arch/x86/configs/i386_emul_defconfig
index 59cb3a2d8b5c..abe4c093b148 100644
--- a/arch/x86/configs/i386_emul_defconfig
+++ b/arch/x86/configs/i386_emul_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.32.9
-# Thu Feb 16 15:57:36 2012
+# Fri Feb 17 13:23:24 2012
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -1708,7 +1708,6 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=y
 # CONFIG_BACKLIGHT_PROGEAR is not set
 # CONFIG_BACKLIGHT_MBP_NVIDIA is not set
 # CONFIG_BACKLIGHT_SAHARA is not set
-CONFIG_BACKLIGHT_EMUL=y
 
 #
 # Display device support
@@ -2164,17 +2163,13 @@ CONFIG_ANDROID_TIMED_OUTPUT=y
 #
 # CONFIG_RAR_REGISTER is not set
 # CONFIG_IIO is not set
-
-#
-# Virtual device drivers for emulator
-#
 CONFIG_MARU=y
 CONFIG_MARU_LCD=y
 CONFIG_MARU_CODEC=y
 CONFIG_MARU_TOUCHSCREEN=y
 CONFIG_MARU_FB=y
 CONFIG_MARU_CAMERA=y
-
+CONFIG_MARU_BACKLIGHT=y
 CONFIG_X86_PLATFORM_DEVICES=y
 # CONFIG_ACER_WMI is not set
 # CONFIG_ASUS_LAPTOP is not set
diff --git a/drivers/maru/Kconfig b/drivers/maru/Kconfig
index 127d9eda2625..1743c1d3cf5e 100644
--- a/drivers/maru/Kconfig
+++ b/drivers/maru/Kconfig
@@ -24,3 +24,10 @@ config MARU_CAMERA
         ---help---
           Enables a MARU Virtual Camera driver.
 
+config MARU_BACKLIGHT
+        tristate "MARU Backlight Driver"
+        depends on MARU && BACKLIGHT_CLASS_DEVICE
+        default y
+        help
+          Say Y to enable the backlight driver of MARU.
+
diff --git a/drivers/maru/Makefile b/drivers/maru/Makefile
index 2d5e68844d26..531bfb306e3b 100644
--- a/drivers/maru/Makefile
+++ b/drivers/maru/Makefile
@@ -3,3 +3,4 @@ obj-$(CONFIG_MARU_CODEC) += maru_codec.o
 obj-$(CONFIG_MARU_TOUCHSCREEN) += maru_touchscreen.o
 obj-$(CONFIG_MARU_FB) += maru_fb.o
 obj-$(CONFIG_MARU_CAMERA) += maru_camera.o
+obj-$(CONFIG_MARU_CAMERA) += maru_bl.o
diff --git a/drivers/video/backlight/Kconfig b/drivers/video/backlight/Kconfig
index 9610621352e6..a93081638b82 100644
--- a/drivers/video/backlight/Kconfig
+++ b/drivers/video/backlight/Kconfig
@@ -261,10 +261,3 @@ config BACKLIGHT_ADP5520
 
 	  To compile this driver as a module, choose M here: the module will
 	  be called adp5520_bl.
-
-config BACKLIGHT_EMUL
-	tristate "Virtual Emulator Backlight Driver"
-	depends on BACKLIGHT_CLASS_DEVICE
-	default y
-	help
-	  Say Y to enable the backlight driver on Emulator.
diff --git a/drivers/video/backlight/Makefile b/drivers/video/backlight/Makefile
index 5e1dbe363095..0f39daaa7645 100644
--- a/drivers/video/backlight/Makefile
+++ b/drivers/video/backlight/Makefile
@@ -28,4 +28,3 @@ obj-$(CONFIG_BACKLIGHT_SAHARA)	+= kb3886_bl.o
 obj-$(CONFIG_BACKLIGHT_WM831X)	+= wm831x_bl.o
 obj-$(CONFIG_BACKLIGHT_ADX)    += adx_bl.o
 obj-$(CONFIG_BACKLIGHT_ADP5520)	+= adp5520_bl.o
-obj-$(CONFIG_BACKLIGHT_EMUL) += emul_backlight.o