diff options
| author | David S. Miller <davem@davemloft.net> | 2019-06-22 08:59:24 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-06-22 08:59:24 -0400 |
| commit | 92ad6325cb891bb455487bfe90cc47d18aa6ec37 (patch) | |
| tree | 433a7ef938fae69789216043f67eff9f9c6b0c68 /drivers/gpio/gpio-max730x.c | |
| parent | e0effb5fbd56a8b2b8917611cbf4fcd9aba92b8f (diff) | |
| parent | c356dc4b540edd6c02b409dd8cf3208ba2804c38 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Minor SPDX change conflict.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/gpio/gpio-max730x.c')
| -rw-r--r-- | drivers/gpio/gpio-max730x.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/gpio/gpio-max730x.c b/drivers/gpio/gpio-max730x.c index 198a36b07773..1e1935c51096 100644 --- a/drivers/gpio/gpio-max730x.c +++ b/drivers/gpio/gpio-max730x.c | |||
| @@ -1,12 +1,9 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0-only | ||
| 1 | /** | 2 | /** |
| 2 | * Copyright (C) 2006 Juergen Beisert, Pengutronix | 3 | * Copyright (C) 2006 Juergen Beisert, Pengutronix |
| 3 | * Copyright (C) 2008 Guennadi Liakhovetski, Pengutronix | 4 | * Copyright (C) 2008 Guennadi Liakhovetski, Pengutronix |
| 4 | * Copyright (C) 2009 Wolfram Sang, Pengutronix | 5 | * Copyright (C) 2009 Wolfram Sang, Pengutronix |
| 5 | * | 6 | * |
| 6 | * This program is free software; you can redistribute it and/or modify | ||
| 7 | * it under the terms of the GNU General Public License version 2 as | ||
| 8 | * published by the Free Software Foundation. | ||
| 9 | * | ||
| 10 | * The Maxim MAX7300/1 device is an I2C/SPI driven GPIO expander. There are | 7 | * The Maxim MAX7300/1 device is an I2C/SPI driven GPIO expander. There are |
| 11 | * 28 GPIOs. 8 of them can trigger an interrupt. See datasheet for more | 8 | * 28 GPIOs. 8 of them can trigger an interrupt. See datasheet for more |
| 12 | * details | 9 | * details |