summaryrefslogtreecommitdiff
path: root/drivers/nfc/mei_phy.h
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-05-28 03:17:27 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-05-31 06:14:00 +0300
commitb144ce2d37619e05afdb0a15676500d76a64b1be (patch)
treec896c3c2cb4bc8135afb9f5128b38f250695c545 /drivers/nfc/mei_phy.h
parent039ae58503f3349157a852c2cd5555a630f0bfaf (diff)
downloadlinux-b144ce2d37619e05afdb0a15676500d76a64b1be.tar.xz
mei: fix up uuid matching
A previous commit, c93b76b34b4d ("mei: bus: report also uuid in module alias") caused a build error as I missed applying a needed patch to add some macros to uapi/linux/uuid.h. Instead of those additional macros, change the mei code to use the existing uuid structure directly. Fixes: c93b76b34b4d Cc: Tomas Winkler <tomas.winkler@intel.com> Cc: Samuel Ortiz <sameo@linux.intel.com> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/nfc/mei_phy.h')
-rw-r--r--drivers/nfc/mei_phy.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nfc/mei_phy.h b/drivers/nfc/mei_phy.h
index a51f8f2685cc..fbfa3e61738f 100644
--- a/drivers/nfc/mei_phy.h
+++ b/drivers/nfc/mei_phy.h
@@ -5,7 +5,7 @@
#include <net/nfc/hci.h>
#include <linux/uuid.h>
-#define MEI_NFC_UUID __UUID_LE(0x0bb17a78, 0x2a8e, 0x4c50, \
+#define MEI_NFC_UUID UUID_LE(0x0bb17a78, 0x2a8e, 0x4c50, \
0x94, 0xd4, 0x50, 0x26, 0x67, 0x23, 0x77, 0x5c)
#define MEI_NFC_HEADER_SIZE 10
#define MEI_NFC_MAX_HCI_PAYLOAD 300