git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6
[safe/jmp/linux-2.6]
/
drivers
/
dma
/
mpc512x_dma.c
diff --git
a/drivers/dma/mpc512x_dma.c
b/drivers/dma/mpc512x_dma.c
index
7a750b9
..
14a8c0f
100644
(file)
--- a/
drivers/dma/mpc512x_dma.c
+++ b/
drivers/dma/mpc512x_dma.c
@@
-37,6
+37,7
@@
#include <linux/dma-mapping.h>
#include <linux/interrupt.h>
#include <linux/io.h>
#include <linux/dma-mapping.h>
#include <linux/interrupt.h>
#include <linux/io.h>
+#include <linux/slab.h>
#include <linux/of_device.h>
#include <linux/of_platform.h>
#include <linux/of_device.h>
#include <linux/of_platform.h>
@@
-629,7
+630,7
@@
mpc_dma_prep_memcpy(struct dma_chan *chan, dma_addr_t dst, dma_addr_t src,
static int __devinit mpc_dma_probe(struct of_device *op,
const struct of_device_id *match)
{
static int __devinit mpc_dma_probe(struct of_device *op,
const struct of_device_id *match)
{
- struct device_node *dn = op->node;
+ struct device_node *dn = op->
dev.of_
node;
struct device *dev = &op->dev;
struct dma_device *dma;
struct mpc_dma *mdma;
struct device *dev = &op->dev;
struct dma_device *dma;
struct mpc_dma *mdma;
@@
-657,7
+658,7
@@
static int __devinit mpc_dma_probe(struct of_device *op,
}
regs_start = res.start;
}
regs_start = res.start;
- regs_size = res
.end - res.start + 1
;
+ regs_size = res
ource_size(&res)
;
if (!devm_request_mem_region(dev, regs_start, regs_size, DRV_NAME)) {
dev_err(dev, "Error requesting memory region!\n");
if (!devm_request_mem_region(dev, regs_start, regs_size, DRV_NAME)) {
dev_err(dev, "Error requesting memory region!\n");
@@
-770,12
+771,12
@@
static struct of_device_id mpc_dma_match[] = {
};
static struct of_platform_driver mpc_dma_driver = {
};
static struct of_platform_driver mpc_dma_driver = {
- .match_table = mpc_dma_match,
.probe = mpc_dma_probe,
.remove = __devexit_p(mpc_dma_remove),
.probe = mpc_dma_probe,
.remove = __devexit_p(mpc_dma_remove),
- .driver = {
- .name = DRV_NAME,
- .owner = THIS_MODULE,
+ .driver = {
+ .name = DRV_NAME,
+ .owner = THIS_MODULE,
+ .of_match_table = mpc_dma_match,
},
};
},
};