Skip to content

Commit

Permalink
p54spi: replace internal "cx3110x" name with "p54spi"
Browse files Browse the repository at this point in the history
While the comment removed in this patch claims board_n800.c uses
"cx3110x", it was never merged to mainline like this.  Mainlined board
files for Nokia N8x0 devices are expected "p54spi", and thus don't
work because the modalias is "cx3110x".  To my knowledge, these
devices are the only real-world use of p54spi, and will not work
without this change.  Tested against my Nokia N810.

Signed-off-by: Luke Dashjr <luke-jr+git@utopios.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Luke-Jr authored and John W. Linville committed Jun 4, 2010
1 parent 38a6cc7 commit 5f1e83d
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions drivers/net/wireless/p54/p54spi.c
Original file line number Diff line number Diff line change
Expand Up @@ -697,9 +697,7 @@ static int __devexit p54spi_remove(struct spi_device *spi)

static struct spi_driver p54spi_driver = {
.driver = {
/* use cx3110x name because board-n800.c uses that for the
* SPI port */
.name = "cx3110x",
.name = "p54spi",
.bus = &spi_bus_type,
.owner = THIS_MODULE,
},
Expand Down Expand Up @@ -733,3 +731,4 @@ module_exit(p54spi_exit);
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Christian Lamparter <chunkeey@web.de>");
MODULE_ALIAS("spi:cx3110x");
MODULE_ALIAS("spi:p54spi");

0 comments on commit 5f1e83d

Please sign in to comment.