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 branch 'linux-next' of git://git.infradead.org/ubi-2.6
[pandora-kernel.git]
/
arch
/
arm
/
common
/
sa1111.c
diff --git
a/arch/arm/common/sa1111.c
b/arch/arm/common/sa1111.c
index
517d50d
..
c0258a8
100644
(file)
--- a/
arch/arm/common/sa1111.c
+++ b/
arch/arm/common/sa1111.c
@@
-678,7
+678,7
@@
out:
* %-EBUSY physical address already marked in-use.
* %0 successful.
*/
-static int
+static int
__devinit
__sa1111_probe(struct device *me, struct resource *mem, int irq)
{
struct sa1111 *sachip;