From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752595AbdKHTft (ORCPT ); Wed, 8 Nov 2017 14:35:49 -0500 Received: from anholt.net ([50.246.234.109]:53454 "EHLO anholt.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752465AbdKHTe5 (ORCPT ); Wed, 8 Nov 2017 14:34:57 -0500 From: Eric Anholt To: dri-devel@lists.freedesktop.org Cc: linux-kernel@vger.kernel.org, Eric Anholt Subject: [PATCH libdrm 4/6] headers: Sync up mga_drm.h from drm-next. Date: Wed, 8 Nov 2017 11:34:45 -0800 Message-Id: <20171108193447.16444-5-eric@anholt.net> X-Mailer: git-send-email 2.15.0 In-Reply-To: <20171108193447.16444-1-eric@anholt.net> References: <20171108193447.16444-1-eric@anholt.net> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The kernel started using the struct from drm.h instead of the typedef. Signed-off-by: Eric Anholt --- include/drm/README | 4 ---- include/drm/mga_drm.h | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/include/drm/README b/include/drm/README index 47d80929a8f1..6e12ca4d81f6 100644 --- a/include/drm/README +++ b/include/drm/README @@ -100,10 +100,6 @@ i915_drm.h - Missing PARAMS - HAS_POOLED_EU, MIN_EU_IN_POOL CONTEXT_PARAM_NO_ERROR_CAPTURE Status: Trivial. -mga_drm.h - - Typo fix, use struct over typedef. -Status: Trivial. - nouveau_drm.h - Missing macros NOUVEAU_GETPARAM*, NOUVEAU_DRM_HEADER_PATCHLEVEL, structs, enums, using stdint.h over the __u* types. diff --git a/include/drm/mga_drm.h b/include/drm/mga_drm.h index 7035a664d503..793001114821 100644 --- a/include/drm/mga_drm.h +++ b/include/drm/mga_drm.h @@ -252,7 +252,7 @@ typedef struct _drm_mga_sarea { #define DRM_MGA_DMA_BOOTSTRAP 0x0c #define DRM_IOCTL_MGA_INIT DRM_IOW( DRM_COMMAND_BASE + DRM_MGA_INIT, drm_mga_init_t) -#define DRM_IOCTL_MGA_FLUSH DRM_IOW( DRM_COMMAND_BASE + DRM_MGA_FLUSH, drm_lock_t) +#define DRM_IOCTL_MGA_FLUSH DRM_IOW( DRM_COMMAND_BASE + DRM_MGA_FLUSH, struct drm_lock) #define DRM_IOCTL_MGA_RESET DRM_IO( DRM_COMMAND_BASE + DRM_MGA_RESET) #define DRM_IOCTL_MGA_SWAP DRM_IO( DRM_COMMAND_BASE + DRM_MGA_SWAP) #define DRM_IOCTL_MGA_CLEAR DRM_IOW( DRM_COMMAND_BASE + DRM_MGA_CLEAR, drm_mga_clear_t) -- 2.15.0