diff options
-rw-r--r-- | Documentation/feature-removal-schedule.txt | 8 | ||||
-rw-r--r-- | include/linux/ioport.h | 2 | ||||
-rw-r--r-- | kernel/resource.c | 2 |
3 files changed, 1 insertions, 11 deletions
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt index ee287988934e..47d714d70821 100644 --- a/Documentation/feature-removal-schedule.txt +++ b/Documentation/feature-removal-schedule.txt | |||
@@ -55,14 +55,6 @@ Who: Mauro Carvalho Chehab <mchehab@brturbo.com.br> | |||
55 | 55 | ||
56 | --------------------------- | 56 | --------------------------- |
57 | 57 | ||
58 | What: remove EXPORT_SYMBOL(insert_resource) | ||
59 | When: April 2006 | ||
60 | Files: kernel/resource.c | ||
61 | Why: No modular usage in the kernel. | ||
62 | Who: Adrian Bunk <bunk@stusta.de> | ||
63 | |||
64 | --------------------------- | ||
65 | |||
66 | What: PCMCIA control ioctl (needed for pcmcia-cs [cardmgr, cardctl]) | 58 | What: PCMCIA control ioctl (needed for pcmcia-cs [cardmgr, cardctl]) |
67 | When: November 2005 | 59 | When: November 2005 |
68 | Files: drivers/pcmcia/: pcmcia_ioctl.c | 60 | Files: drivers/pcmcia/: pcmcia_ioctl.c |
diff --git a/include/linux/ioport.h b/include/linux/ioport.h index 5612dfeeae50..d42c83399071 100644 --- a/include/linux/ioport.h +++ b/include/linux/ioport.h | |||
@@ -97,7 +97,7 @@ extern struct resource iomem_resource; | |||
97 | extern int request_resource(struct resource *root, struct resource *new); | 97 | extern int request_resource(struct resource *root, struct resource *new); |
98 | extern struct resource * ____request_resource(struct resource *root, struct resource *new); | 98 | extern struct resource * ____request_resource(struct resource *root, struct resource *new); |
99 | extern int release_resource(struct resource *new); | 99 | extern int release_resource(struct resource *new); |
100 | extern __deprecated_for_modules int insert_resource(struct resource *parent, struct resource *new); | 100 | extern int insert_resource(struct resource *parent, struct resource *new); |
101 | extern int allocate_resource(struct resource *root, struct resource *new, | 101 | extern int allocate_resource(struct resource *root, struct resource *new, |
102 | resource_size_t size, resource_size_t min, | 102 | resource_size_t size, resource_size_t min, |
103 | resource_size_t max, resource_size_t align, | 103 | resource_size_t max, resource_size_t align, |
diff --git a/kernel/resource.c b/kernel/resource.c index 129cf046e561..0dd3a857579e 100644 --- a/kernel/resource.c +++ b/kernel/resource.c | |||
@@ -404,8 +404,6 @@ int insert_resource(struct resource *parent, struct resource *new) | |||
404 | return result; | 404 | return result; |
405 | } | 405 | } |
406 | 406 | ||
407 | EXPORT_SYMBOL(insert_resource); | ||
408 | |||
409 | /* | 407 | /* |
410 | * Given an existing resource, change its start and size to match the | 408 | * Given an existing resource, change its start and size to match the |
411 | * arguments. Returns -EBUSY if it can't fit. Existing children of | 409 | * arguments. Returns -EBUSY if it can't fit. Existing children of |