projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-4.5/nvme' of git://git.kernel.dk/linux-block
[cascardo/linux.git]
/
arch
/
avr32
/
mach-at32ap
/
pdc.c
diff --git
a/arch/avr32/mach-at32ap/pdc.c
b/arch/avr32/mach-at32ap/pdc.c
index
1040bda
..
61ab15a
100644
(file)
--- a/
arch/avr32/mach-at32ap/pdc.c
+++ b/
arch/avr32/mach-at32ap/pdc.c
@@
-35,7
+35,6
@@
static int __init pdc_probe(struct platform_device *pdev)
}
static struct platform_driver pdc_driver = {
}
static struct platform_driver pdc_driver = {
- .probe = pdc_probe,
.driver = {
.name = "pdc",
},
.driver = {
.name = "pdc",
},
@@
-43,6
+42,6
@@
static struct platform_driver pdc_driver = {
static int __init pdc_init(void)
{
static int __init pdc_init(void)
{
- return platform_driver_
register(&pdc_driver
);
+ return platform_driver_
probe(&pdc_driver, pdc_probe
);
}
arch_initcall(pdc_init);
}
arch_initcall(pdc_init);