Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 64625
b: refs/heads/master
c: fc3ba95
h: refs/heads/master
i:
  64623: dda6ed2
v: v3
  • Loading branch information
David Brownell authored and Linus Torvalds committed Aug 31, 2007
1 parent a06e285 commit 4331a5a
Show file tree
Hide file tree
Showing 8 changed files with 9 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f2ab6d8889422c1f5354f014e8bef337b1d1bade
refs/heads/master: fc3ba9525b50ea0d1670357ece21ebedcee507ae
3 changes: 2 additions & 1 deletion trunk/drivers/spi/spi_bfin5xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -1303,8 +1303,9 @@ static int bfin5xx_spi_resume(struct platform_device *pdev)
#define bfin5xx_spi_resume NULL
#endif /* CONFIG_PM */

MODULE_ALIAS("bfin-spi-master"); /* for platform bus hotplug */
static struct platform_driver bfin5xx_spi_driver = {
.driver = {
.driver = {
.name = "bfin-spi-master",
.owner = THIS_MODULE,
},
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/spi/spi_imx.c
Original file line number Diff line number Diff line change
Expand Up @@ -1735,7 +1735,7 @@ static int spi_imx_resume(struct platform_device *pdev)

static struct platform_driver driver = {
.driver = {
.name = "imx-spi",
.name = "spi_imx",
.bus = &platform_bus_type,
.owner = THIS_MODULE,
},
Expand Down
1 change: 1 addition & 0 deletions trunk/drivers/spi/spi_mpc83xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -530,6 +530,7 @@ static int __devexit mpc83xx_spi_remove(struct platform_device *dev)
return 0;
}

MODULE_ALIAS("mpc83xx_spi"); /* for platform bus hotplug */
static struct platform_driver mpc83xx_spi_driver = {
.probe = mpc83xx_spi_probe,
.remove = __devexit_p(mpc83xx_spi_remove),
Expand Down
1 change: 1 addition & 0 deletions trunk/drivers/spi/spi_s3c24xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -427,6 +427,7 @@ static int s3c24xx_spi_resume(struct platform_device *pdev)
#define s3c24xx_spi_resume NULL
#endif

MODULE_ALIAS("s3c2410_spi"); /* for platform bus hotplug */
static struct platform_driver s3c24xx_spidrv = {
.probe = s3c24xx_spi_probe,
.remove = s3c24xx_spi_remove,
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/spi/spi_s3c24xx_gpio.c
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ static struct platform_driver s3c2410_spigpio_drv = {
.suspend = s3c2410_spigpio_suspend,
.resume = s3c2410_spigpio_resume,
.driver = {
.name = "s3c24xx-spi-gpio",
.name = "spi_s3c24xx_gpio",
.owner = THIS_MODULE,
},
};
Expand Down
1 change: 1 addition & 0 deletions trunk/drivers/spi/spi_txx9.c
Original file line number Diff line number Diff line change
Expand Up @@ -450,6 +450,7 @@ static int __exit txx9spi_remove(struct platform_device *dev)
return 0;
}

MODULE_ALIAS("txx9spi"); /* for platform bus hotplug */
static struct platform_driver txx9spi_driver = {
.remove = __exit_p(txx9spi_remove),
.driver = {
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/spi/xilinx_spi.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

#include <syslib/virtex_devices.h>

#define XILINX_SPI_NAME "xspi"
#define XILINX_SPI_NAME "xilinx_spi"

/* Register definitions as per "OPB Serial Peripheral Interface (SPI) (v1.00e)
* Product Specification", DS464
Expand Down

0 comments on commit 4331a5a

Please sign in to comment.