Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4c845185 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'spi/topic/omap-100k', 'spi/topic/omap-uwire',... 

Merge remote-tracking branches 'spi/topic/omap-100k', 'spi/topic/omap-uwire', 'spi/topic/owner', 'spi/topic/pxa' and 'spi/topic/pxa2xx' into spi-next
parents fc579056 76f67ea9 160f8d06 3821a065 54bf4505 0db64215

arch/arm/mach-u300/dummyspichip.c

+0 −1
Original line number Diff line number Diff line
@@ -264,7 +264,6 @@ static const struct of_device_id pl022_dummy_dt_match[] = { 
static struct spi_driver pl022_dummy_driver = {

	.driver = {

		.name	= "spi-dummy",

		.owner	= THIS_MODULE,

		.of_match_table = pl022_dummy_dt_match,

	},

	.probe	= pl022_dummy_probe,

arch/mips/txx9/generic/spi_eeprom.c

+0 −1
Original line number Diff line number Diff line
@@ -80,7 +80,6 @@ static int __init early_seeprom_probe(struct spi_device *spi) 
static struct spi_driver early_seeprom_driver __initdata = {

	.driver = {

		.name	= "at25",

		.owner	= THIS_MODULE,

	},

	.probe	= early_seeprom_probe,

};

drivers/char/tpm/st33zp24/spi.c

+0 −1
Original line number Diff line number Diff line
@@ -381,7 +381,6 @@ static SIMPLE_DEV_PM_OPS(st33zp24_spi_ops, st33zp24_pm_suspend, 


static struct spi_driver tpm_st33_spi_driver = {

	.driver = {

		.owner = THIS_MODULE,

		.name = TPM_ST33_SPI,

		.pm = &st33zp24_spi_ops,

		.of_match_table = of_match_ptr(of_st33zp24_spi_match),

drivers/gpio/gpio-74x164.c

+0 −1
Original line number Diff line number Diff line
@@ -183,7 +183,6 @@ MODULE_DEVICE_TABLE(of, gen_74x164_dt_ids); 
static struct spi_driver gen_74x164_driver = {

	.driver = {

		.name		= "74x164",

		.owner		= THIS_MODULE,

		.of_match_table	= gen_74x164_dt_ids,

	},

	.probe		= gen_74x164_probe,

drivers/gpio/gpio-max7301.c

+0 −1
Original line number Diff line number Diff line
@@ -87,7 +87,6 @@ MODULE_DEVICE_TABLE(spi, max7301_id); 
static struct spi_driver max7301_driver = {

	.driver = {

		.name = "max7301",

		.owner = THIS_MODULE,

	},

	.probe = max7301_probe,

	.remove = max7301_remove,