From: Sangjin Kim Date: Thu, 11 Jul 2013 07:20:58 +0000 (+0900) Subject: Change the base id of tizen virtio devices to 30. X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=50ec72e6346d516d853e22bcf8ab9c90fb8a3630;p=sdk%2Femulator%2Femulator-kernel.git Change the base id of tizen virtio devices to 30. Change-Id: I48ebde8b407ee51c7ff62fd8678711c45667e400 Signed-off-by: Sangjin Kim --- diff --git a/drivers/char/virtio-gl.c b/drivers/char/virtio-gl.c index 380940fbe1ef..ddcc75844de8 100755 --- a/drivers/char/virtio-gl.c +++ b/drivers/char/virtio-gl.c @@ -29,7 +29,7 @@ #include #include -#define VIRTIO_ID_GL 6 +//#define VIRTIO_ID_GL 36 /* use "include/linux/virtio_ids.h" file instead */ #define DEVICE_NAME "glmem" /* Define to use debugging checksums on transfers */ diff --git a/include/linux/virtio_ids.h b/include/linux/virtio_ids.h index f401735b2e33..b2f851475a79 100644 --- a/include/linux/virtio_ids.h +++ b/include/linux/virtio_ids.h @@ -34,17 +34,18 @@ #define VIRTIO_ID_CONSOLE 3 /* virtio console */ #define VIRTIO_ID_RNG 4 /* virtio ring */ #define VIRTIO_ID_BALLOON 5 /* virtio balloon */ -#define VIRTIO_ID_GL 6 /* virtio usermem */ #define VIRTIO_ID_RPMSG 7 /* virtio remote processor messaging */ #define VIRTIO_ID_SCSI 8 /* virtio scsi */ #define VIRTIO_ID_9P 9 /* 9p virtio console */ #ifdef CONFIG_MARU /* Maru devices */ -#define VIRTIO_ID_TOUCHSCREEN 11 /* virtio touchscreen */ -#define VIRTIO_ID_KEYBOARD 12 /* virtio keyboard */ -#define VIRTIO_ID_ESM 13 /* virtio ESM */ -#define VIRTIO_ID_HWKEY 14 /* virtio hwkey */ +#define VIRTIO_ID_TOUCHSCREEN 31 /* virtio touchscreen */ +#define VIRTIO_ID_KEYBOARD 32 /* virtio keyboard */ +#define VIRTIO_ID_ESM 33 /* virtio Emulator Status Monitor */ +#define VIRTIO_ID_HWKEY 34 /* virtio hwkey */ +#define VIRTIO_ID_EVDI 35 /* virtio emulator virtual device interface */ +#define VIRTIO_ID_GL 36 /* virtio glmem */ #endif #endif /* _LINUX_VIRTIO_IDS_H */