diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-05-01 18:23:38 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-05-01 18:23:38 -0400 |
| commit | ffc2825c2942b57c5dbfbcb3ad798696438aed62 (patch) | |
| tree | 72be91daae4cbc84ba02152ccd7ae9899783a7d0 /drivers/misc/Makefile | |
| parent | 589b3d06fd159774f9f5c3639d8d5d938670c019 (diff) | |
| download | linux-ffc2825c2942b57c5dbfbcb3ad798696438aed62.tar.bz2 | |
Staging: mei: move the mei code out of staging
It's been cleaned up, and there's nothing else left to do, so move it
out of staging into drivers/misc/ where all can use it now.
Cc: Tomas Winkler <tomas.winkler@intel.com>
Cc: Oren Weil <oren.jer.weil@intel.com>
Cc: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc/Makefile')
| -rw-r--r-- | drivers/misc/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile index 3e1d80106f04..0f6af6a13345 100644 --- a/drivers/misc/Makefile +++ b/drivers/misc/Makefile @@ -49,3 +49,4 @@ obj-y += carma/ obj-$(CONFIG_USB_SWITCH_FSA9480) += fsa9480.o obj-$(CONFIG_ALTERA_STAPL) +=altera-stapl/ obj-$(CONFIG_MAX8997_MUIC) += max8997-muic.o +obj-$(CONFIG_INTEL_MEI) += mei/ |