diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-07-27 14:27:06 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-07-27 14:27:06 -0400 |
| commit | 20f99dcf417a28089ef6c877ae97f5dec2eab435 (patch) | |
| tree | b4fe1f3e429d6a82ddaaa8e12899da630cfa8a63 /kernel/resource.c | |
| parent | dd2f5538a157bda68bfa8efb39feaaccdda9e74e (diff) | |
| parent | 64821324ca49f24be1a66f2f432108f96a24e596 (diff) | |
Merge branch 'from-linus' into upstream
Diffstat (limited to 'kernel/resource.c')
| -rw-r--r-- | kernel/resource.c | 2 |
1 files changed, 0 insertions, 2 deletions
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 |