[linux-yocto] [standard/emenlow branch 2/2] Revert "emenlow: switch to psb"

[nitin.a.kamble at intel.com]

From: Nitin A Kamble <nitin.a.kamble at intel.com>

This reverts commit 2f603ad6a4e9163d7d85ec66798919d1ed3bad1b.

With the removal of the drm-psb code, we need to undo the switchover
to it.

Signed-off-by: Nitin A Kamble <nitin.a.kamble at intel.com>
Signed-off-by: Tom Zanussi <tom.zanussi at intel.com>
---
 drivers/gpu/Makefile  |    2 +-
 drivers/video/Kconfig |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/Makefile b/drivers/gpu/Makefile
index 7585044..cc92778 100644
--- a/drivers/gpu/Makefile
+++ b/drivers/gpu/Makefile
@@ -1 +1 @@
-obj-y			+= drm-psb/ vga/ stub/
+obj-y			+= drm/ vga/ stub/
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index d9a1397..a290be5 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -19,7 +19,7 @@ source "drivers/char/agp/Kconfig"
 
 source "drivers/gpu/vga/Kconfig"
 
-source "drivers/gpu/drm-psb/Kconfig"
+source "drivers/gpu/drm/Kconfig"
 
 source "drivers/gpu/stub/Kconfig"
 
-- 
1.7.3.4