projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'backport/v3.14.24-ltsi-rc1/phy-rcar-gen2-usb-to-v3.15' into backport/v3...
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
drivers
/
i2c
/
busses
/
i2c-hydra.c
diff --git
a/drivers/i2c/busses/i2c-hydra.c
b/drivers/i2c/busses/i2c-hydra.c
index
e248257
..
b7864cf
100644
(file)
--- a/
drivers/i2c/busses/i2c-hydra.c
+++ b/
drivers/i2c/busses/i2c-hydra.c
@@
-15,10
+15,6
@@
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.
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., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <linux/kernel.h>
*/
#include <linux/kernel.h>
@@
-104,7
+100,7
@@
static struct i2c_adapter hydra_adap = {
.algo_data = &hydra_bit_data,
};
.algo_data = &hydra_bit_data,
};
-static
DEFINE_PCI_DEVICE_TABLE(hydra_ids)
= {
+static
const struct pci_device_id hydra_ids[]
= {
{ PCI_DEVICE(PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_HYDRA) },
{ 0, }
};
{ PCI_DEVICE(PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_HYDRA) },
{ 0, }
};