diff options
| author | Tomas Winkler <tomas.winkler@intel.com> | 2015-07-23 14:08:34 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-08-04 02:20:26 +0200 |
| commit | a0a785c4ab91656a5413b4cd5bb8ed59f39f7446 (patch) | |
| tree | ca5c2de5e62080ab756cbb9f859ffabcc6105f54 /drivers/misc | |
| parent | mei: bus: fix drivers and devices names confusion (diff) | |
| download | linux-a0a785c4ab91656a5413b4cd5bb8ed59f39f7446.tar.xz linux-a0a785c4ab91656a5413b4cd5bb8ed59f39f7446.zip | |
mei: bus: rename nfc.c to bus-fixup.c
The bus-fixup.c will be a place for fixups and quirks
for all types of me client devices.
As for now it contians only the fixup for setting
the nfc device name on the me client bus.
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/mei/Makefile | 2 | ||||
| -rw-r--r-- | drivers/misc/mei/bus-fixup.c (renamed from drivers/misc/mei/nfc.c) | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/drivers/misc/mei/Makefile b/drivers/misc/mei/Makefile index 518914a82b83..01447ca21c26 100644 --- a/drivers/misc/mei/Makefile +++ b/drivers/misc/mei/Makefile @@ -11,7 +11,7 @@ mei-objs += main.o mei-objs += amthif.o mei-objs += wd.o mei-objs += bus.o -mei-objs += nfc.o +mei-objs += bus-fixup.o mei-$(CONFIG_DEBUG_FS) += debugfs.o obj-$(CONFIG_INTEL_MEI_ME) += mei-me.o diff --git a/drivers/misc/mei/nfc.c b/drivers/misc/mei/bus-fixup.c index 47aa1523d9e1..47aa1523d9e1 100644 --- a/drivers/misc/mei/nfc.c +++ b/drivers/misc/mei/bus-fixup.c |