Commit 6afb24a0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'hwlock-v6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux 

Pull hwspinlock update from Bjorn Andersson:
 "This drops the last of_match_ptr() from the hwspinlock drivers,
  solving the resulting 'defined but not used' warning/error"

* tag 'hwlock-v6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux:
  hwspinlock: omap: drop of_match_ptr for ID table
parents b39aeb33 1b39e760

drivers/hwspinlock/omap_hwspinlock.c

+1 −1
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ static struct platform_driver omap_hwspinlock_driver = { 
	.remove		= omap_hwspinlock_remove,

	.driver		= {

		.name	= "omap_hwspinlock",

		.of_match_table = of_match_ptr(omap_hwspinlock_of_match),

		.of_match_table = omap_hwspinlock_of_match,

	},

};