diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-09-13 11:24:25 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-09-13 11:24:25 -0400 |
| commit | b2315372eac9cd9f622c32a93e323cf6f0f03462 (patch) | |
| tree | 9e1faa7cdcddf5d90bec4fb9523742d4cce699a1 /drivers/spi/spi_txx9.c | |
| parent | 5326152fa182b0a16e4abf913ce403e3c7ab53b7 (diff) | |
| parent | c87ce65868bbf9bbea9c3f112ff8315302daf8f2 (diff) | |
Merge branch 'linux-2.6' into for-2.6.24
Diffstat (limited to 'drivers/spi/spi_txx9.c')
| -rw-r--r-- | drivers/spi/spi_txx9.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi_txx9.c b/drivers/spi/spi_txx9.c index 08e981c40646..b7f4bb239eaf 100644 --- a/drivers/spi/spi_txx9.c +++ b/drivers/spi/spi_txx9.c | |||
| @@ -453,7 +453,7 @@ static int __exit txx9spi_remove(struct platform_device *dev) | |||
| 453 | static struct platform_driver txx9spi_driver = { | 453 | static struct platform_driver txx9spi_driver = { |
| 454 | .remove = __exit_p(txx9spi_remove), | 454 | .remove = __exit_p(txx9spi_remove), |
| 455 | .driver = { | 455 | .driver = { |
| 456 | .name = "txx9spi", | 456 | .name = "spi_txx9", |
| 457 | .owner = THIS_MODULE, | 457 | .owner = THIS_MODULE, |
| 458 | }, | 458 | }, |
| 459 | }; | 459 | }; |