projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' into gfs2
[powerpc.git]
/
arch
/
x86_64
/
kernel
/
pci-nommu.c
diff --git
a/arch/x86_64/kernel/pci-nommu.c
b/arch/x86_64/kernel/pci-nommu.c
index
aad7609
..
df09ab0
100644
(file)
--- a/
arch/x86_64/kernel/pci-nommu.c
+++ b/
arch/x86_64/kernel/pci-nommu.c
@@
-59,7
+59,6
@@
int nommu_map_sg(struct device *hwdev, struct scatterlist *sg,
{
int i;
- BUG_ON(direction == DMA_NONE);
for (i = 0; i < nents; i++ ) {
struct scatterlist *s = &sg[i];
BUG_ON(!s->page);