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 master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
[pandora-kernel.git]
/
kernel
/
resource.c
diff --git
a/kernel/resource.c
b/kernel/resource.c
index
92285d8
..
e3080fc
100644
(file)
--- a/
kernel/resource.c
+++ b/
kernel/resource.c
@@
-464,7
+464,7
@@
struct resource * __request_region(struct resource *parent, unsigned long start,
EXPORT_SYMBOL(__request_region);
-int __
deprecated __
check_region(struct resource *parent, unsigned long start, unsigned long n)
+int __check_region(struct resource *parent, unsigned long start, unsigned long n)
{
struct resource * res;