summaryrefslogtreecommitdiffstats
path: root/drivers/staging/Makefile
diff options
context:
space:
mode:
authorSudip Mukherjee <sudipm.mukherjee@gmail.com>2015-08-07 18:31:13 +0530
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-08-07 15:05:01 -0700
commit1461d66728648540a043ba69ace1081ed5006faf (patch)
tree7a03cc6a1f3204082d3fd5784e5508cc44403633 /drivers/staging/Makefile
parentb96e53df92ab6ed1ca58639f0bbfacaf717e285b (diff)
downloadtalos-obmc-linux-1461d66728648540a043ba69ace1081ed5006faf.tar.gz
talos-obmc-linux-1461d66728648540a043ba69ace1081ed5006faf.zip
staging: sm7xxfb: merge sm712fb with fbdev
Now since all cleanups are done and the code is ready to be merged lets move it out of staging into fbdev location. Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/Makefile')
-rw-r--r--drivers/staging/Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index 37149ca6a331..018093d60e85 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -22,7 +22,6 @@ obj-$(CONFIG_VT6655) += vt6655/
obj-$(CONFIG_VT6656) += vt6656/
obj-$(CONFIG_VME_BUS) += vme/
obj-$(CONFIG_IIO) += iio/
-obj-$(CONFIG_FB_SM7XX) += sm7xxfb/
obj-$(CONFIG_FB_SM750) += sm750fb/
obj-$(CONFIG_FB_XGI) += xgifb/
obj-$(CONFIG_USB_EMXX) += emxx_udc/
OpenPOWER on IntegriCloud