diff options
author | Dave Cobbley <david.j.cobbley@linux.intel.com> | 2018-08-14 20:05:37 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-08-23 04:26:31 +0300 |
commit | eb8dc40360f0cfef56fb6947cc817a547d6d9bc6 (patch) | |
tree | de291a73dc37168da6370e2cf16c347d1eba9df8 /poky/meta/recipes-devtools/i2c-tools/files/remove-i2c-dev.patch | |
parent | 9c3cf826d853102535ead04cebc2d6023eff3032 (diff) | |
download | openbmc-eb8dc40360f0cfef56fb6947cc817a547d6d9bc6.tar.xz |
[Subtree] Removing import-layers directory
As part of the move to subtrees, need to bring all the import layers
content to the top level.
Change-Id: I4a163d10898cbc6e11c27f776f60e1a470049d8f
Signed-off-by: Dave Cobbley <david.j.cobbley@linux.intel.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'poky/meta/recipes-devtools/i2c-tools/files/remove-i2c-dev.patch')
-rw-r--r-- | poky/meta/recipes-devtools/i2c-tools/files/remove-i2c-dev.patch | 98 |
1 files changed, 98 insertions, 0 deletions
diff --git a/poky/meta/recipes-devtools/i2c-tools/files/remove-i2c-dev.patch b/poky/meta/recipes-devtools/i2c-tools/files/remove-i2c-dev.patch new file mode 100644 index 000000000..703688d08 --- /dev/null +++ b/poky/meta/recipes-devtools/i2c-tools/files/remove-i2c-dev.patch @@ -0,0 +1,98 @@ +Upstream-Status: Backport +Signed-off-by: Ross Burton <ross.burton@intel.com> + +From 226bc03acca44cf4b300597308064c44676b6f4b Mon Sep 17 00:00:00 2001 +From: Jean Delvare <jdelvare@suse.de> +Date: Tue, 23 Jan 2018 14:24:16 +0100 +Subject: Delete duplicate i2c-dev.h + +The <linux/i2c-dev.h> header file is provided by the kernel, so drop +our own copy of this file. + +Signed-off-by: Jean Delvare <jdelvare@suse.de> +Acked-by: Wolfram Sang <wsa@the-dreams.de> +--- + include/linux/i2c-dev.h | 72 ------------------------------------------------- + 1 file changed, 72 deletions(-) + delete mode 100644 include/linux/i2c-dev.h + +diff --git a/include/linux/i2c-dev.h b/include/linux/i2c-dev.h +deleted file mode 100644 +index 839d25a..0000000 +--- a/include/linux/i2c-dev.h ++++ /dev/null +@@ -1,72 +0,0 @@ +-/* +- i2c-dev.h - i2c-bus driver, char device interface +- +- Copyright (C) 1995-97 Simon G. Vogl +- Copyright (C) 1998-99 Frodo Looijaard <frodol@dds.nl> +- +- This program is free software; you can redistribute it and/or modify +- it under the terms of the GNU General Public License as published by +- the Free Software Foundation; either version 2 of the License, or +- (at your option) any later version. +- +- This program is distributed in the hope that 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. +- +- You should have received a copy of the GNU General Public License +- along with this program; if not, write to the Free Software +- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +- MA 02110-1301 USA. +-*/ +- +-#ifndef _LINUX_I2C_DEV_H +-#define _LINUX_I2C_DEV_H +- +-#include <linux/types.h> +- +- +-/* /dev/i2c-X ioctl commands. The ioctl's parameter is always an +- * unsigned long, except for: +- * - I2C_FUNCS, takes pointer to an unsigned long +- * - I2C_RDWR, takes pointer to struct i2c_rdwr_ioctl_data +- * - I2C_SMBUS, takes pointer to struct i2c_smbus_ioctl_data +- */ +-#define I2C_RETRIES 0x0701 /* number of times a device address should +- be polled when not acknowledging */ +-#define I2C_TIMEOUT 0x0702 /* set timeout in units of 10 ms */ +- +-/* NOTE: Slave address is 7 or 10 bits, but 10-bit addresses +- * are NOT supported! (due to code brokenness) +- */ +-#define I2C_SLAVE 0x0703 /* Use this slave address */ +-#define I2C_SLAVE_FORCE 0x0706 /* Use this slave address, even if it +- is already in use by a driver! */ +-#define I2C_TENBIT 0x0704 /* 0 for 7 bit addrs, != 0 for 10 bit */ +- +-#define I2C_FUNCS 0x0705 /* Get the adapter functionality mask */ +- +-#define I2C_RDWR 0x0707 /* Combined R/W transfer (one STOP only) */ +- +-#define I2C_PEC 0x0708 /* != 0 to use PEC with SMBus */ +-#define I2C_SMBUS 0x0720 /* SMBus transfer */ +- +- +-/* This is the structure as used in the I2C_SMBUS ioctl call */ +-struct i2c_smbus_ioctl_data { +- __u8 read_write; +- __u8 command; +- __u32 size; +- union i2c_smbus_data *data; +-}; +- +-/* This is the structure as used in the I2C_RDWR ioctl call */ +-struct i2c_rdwr_ioctl_data { +- struct i2c_msg *msgs; /* pointers to i2c_msgs */ +- __u32 nmsgs; /* number of i2c_msgs */ +-}; +- +-#define I2C_RDRW_IOCTL_MAX_MSGS 42 +- +- +-#endif /* _LINUX_I2C_DEV_H */ +-- +cgit v1.1 |