git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.infradead.org/~dwmw2/mtd-2.6.35
[pandora-kernel.git]
/
drivers
/
block
/
swim3.c
diff --git
a/drivers/block/swim3.c
b/drivers/block/swim3.c
index
52f2d11
..
ed6fb91
100644
(file)
--- a/
drivers/block/swim3.c
+++ b/
drivers/block/swim3.c
@@
-1159,8
+1159,10
@@
static struct of_device_id swim3_match[] =
static struct macio_driver swim3_driver =
{
static struct macio_driver swim3_driver =
{
- .name = "swim3",
- .match_table = swim3_match,
+ .driver = {
+ .name = "swim3",
+ .of_match_table = swim3_match,
+ },
.probe = swim3_attach,
#if 0
.suspend = swim3_suspend,
.probe = swim3_attach,
#if 0
.suspend = swim3_suspend,