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

Commit 73b5301b authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'spi-spidev' into spi-next

parents 31271e9a 8fad805b

drivers/spi/spidev.c

+10 −0
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ 
#include <linux/mutex.h>

#include <linux/slab.h>

#include <linux/compat.h>

#include <linux/of.h>

#include <linux/of_device.h>



#include <linux/spi/spi.h>

#include <linux/spi/spidev.h>
@@ -642,10 +644,18 @@ static int __devexit spidev_remove(struct spi_device *spi) 
	return 0;

}



static const struct of_device_id spidev_dt_ids[] = {

	{ .compatible = "rohm,dh2228fv" },

	{},

};



MODULE_DEVICE_TABLE(of, spidev_dt_ids);



static struct spi_driver spidev_spi_driver = {

	.driver = {

		.name =		"spidev",

		.owner =	THIS_MODULE,

		.of_match_table = of_match_ptr(spidev_dt_ids),

	},

	.probe =	spidev_probe,

	.remove =	__devexit_p(spidev_remove),