From akpm@osdl.org Fri Jun 30 16:30:44 2006 From: Adrian Bunk Message-Id: <200606300915.k5U9Fgeu001057@shell0.pdx.osdl.net> Subject: The scheduled unexport of insert_resource To: greg@kroah.com Cc: akpm@osdl.org, bunk@stusta.de Date: Fri, 30 Jun 2006 02:15:42 -0700 From: Adrian Bunk Implement the scheduled unexport of insert_resource. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman --- Documentation/feature-removal-schedule.txt | 8 -------- include/linux/ioport.h | 2 +- kernel/resource.c | 2 -- 3 files changed, 1 insertion(+), 11 deletions(-) --- gregkh-2.6.orig/Documentation/feature-removal-schedule.txt +++ gregkh-2.6/Documentation/feature-removal-schedule.txt @@ -55,14 +55,6 @@ Who: Mauro Carvalho Chehab - ---------------------------- - What: PCMCIA control ioctl (needed for pcmcia-cs [cardmgr, cardctl]) When: November 2005 Files: drivers/pcmcia/: pcmcia_ioctl.c --- gregkh-2.6.orig/include/linux/ioport.h +++ gregkh-2.6/include/linux/ioport.h @@ -96,7 +96,7 @@ extern struct resource iomem_resource; extern int request_resource(struct resource *root, struct resource *new); extern struct resource * ____request_resource(struct resource *root, struct resource *new); extern int release_resource(struct resource *new); -extern __deprecated_for_modules int insert_resource(struct resource *parent, struct resource *new); +extern int insert_resource(struct resource *parent, struct resource *new); extern int allocate_resource(struct resource *root, struct resource *new, resource_size_t size, resource_size_t min, resource_size_t max, resource_size_t align, --- gregkh-2.6.orig/kernel/resource.c +++ gregkh-2.6/kernel/resource.c @@ -404,8 +404,6 @@ int insert_resource(struct resource *par return result; } -EXPORT_SYMBOL(insert_resource); - /* * Given an existing resource, change its start and size to match the * arguments. Returns -EBUSY if it can't fit. Existing children of