Staging: android: add the code back to the build
authorGreg Kroah-Hartman <gregkh@suse.de>
Wed, 30 Nov 2011 11:33:10 +0000 (20:33 +0900)
committerGrazvydas Ignotas <notasas@gmail.com>
Wed, 25 Apr 2012 22:31:32 +0000 (01:31 +0300)
It builds, so ship it!

Cc: Arve Hjønnevåg <arve@android.com>
Cc: Brian Swetland <swetland@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/Kconfig
drivers/staging/Makefile

Simple merge
Simple merge