summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Chauvet <kwizart@gmail.com>2014-05-18 17:21:21 +0200
committerNicolas Chauvet <kwizart@gmail.com>2014-05-18 17:21:21 +0200
commita8d927d11cd1d6b113c7291f6de5c6cca36cf1fc (patch)
tree4f4bf88d5748c6f07f466f8c033612a02be8cf24
parent8edfed1101358caabab6d39a812454a9bbdb5a4f (diff)
downloadkernel-a8d927d11cd1d6b113c7291f6de5c6cca36cf1fc.tar.gz
kernel-a8d927d11cd1d6b113c7291f6de5c6cca36cf1fc.tar.xz
kernel-a8d927d11cd1d6b113c7291f6de5c6cca36cf1fc.zip
Remove tegra_drm.h backport
-rw-r--r--Update_tegra_drm-linux-next.patch45
1 files changed, 0 insertions, 45 deletions
diff --git a/Update_tegra_drm-linux-next.patch b/Update_tegra_drm-linux-next.patch
index 58bffa02..c31314de 100644
--- a/Update_tegra_drm-linux-next.patch
+++ b/Update_tegra_drm-linux-next.patch
@@ -101820,51 +101820,6 @@ index d9ea3a7..aefa2f6 100644
struct drm_radeon_info {
-diff --git a/include/uapi/drm/tegra_drm.h b/include/uapi/drm/tegra_drm.h
-index 5e1ab55..b754821 100644
---- a/include/uapi/drm/tegra_drm.h
-+++ b/include/uapi/drm/tegra_drm.h
-@@ -1,17 +1,23 @@
- /*
- * Copyright (c) 2012-2013, NVIDIA CORPORATION. All rights reserved.
- *
-- * This program is free software; you can redistribute it and/or modify it
-- * under the terms and conditions of the GNU General Public License,
-- * version 2, as published by the Free Software Foundation.
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the "Software"),
-+ * to deal in the Software without restriction, including without limitation
-+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+ * and/or sell copies of the Software, and to permit persons to whom the
-+ * Software is furnished to do so, subject to the following conditions:
- *
-- * This program is distributed in the hope it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-- * more details.
-+ * The above copyright notice and this permission notice shall be included in
-+ * all copies or substantial portions of the Software.
- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program. If not, see <http://www.gnu.org/licenses/>.
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
-+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-+ * OTHER DEALINGS IN THE SOFTWARE.
- */
-
- #ifndef _UAPI_TEGRA_DRM_H_
-@@ -114,7 +120,6 @@ struct drm_tegra_submit {
- __u32 num_waitchks;
- __u32 waitchk_mask;
- __u32 timeout;
-- __u32 pad;
- __u64 syncpts;
- __u64 cmdbufs;
- __u64 relocs;
diff --git a/include/uapi/drm/vmwgfx_drm.h b/include/uapi/drm/vmwgfx_drm.h
index 87792a5..4fc66f6 100644
--- a/include/uapi/drm/vmwgfx_drm.h