diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-10 21:43:52 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-10 21:43:52 -0500 |
| commit | 99cd7074891f87c49660e3b2880564324a4733ac (patch) | |
| tree | 903d2665bcb445f1f265d1adf7a99f265bcefc15 /drivers/char/mem.c | |
| parent | e8a9cbf6ae620d9e5ba9cb42001c033287a284a3 (diff) | |
| parent | c59765042f53a79a7a65585042ff463b69cb248c (diff) | |
Merge commit 'v2.6.29-rc1' into tracing/urgent
Diffstat (limited to 'drivers/char/mem.c')
| -rw-r--r-- | drivers/char/mem.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/char/mem.c b/drivers/char/mem.c index 6431f6921a67..3586b3b3df3f 100644 --- a/drivers/char/mem.c +++ b/drivers/char/mem.c | |||
| @@ -425,9 +425,6 @@ static ssize_t read_oldmem(struct file *file, char __user *buf, | |||
| 425 | } | 425 | } |
| 426 | #endif | 426 | #endif |
| 427 | 427 | ||
| 428 | extern long vread(char *buf, char *addr, unsigned long count); | ||
| 429 | extern long vwrite(char *buf, char *addr, unsigned long count); | ||
| 430 | |||
| 431 | #ifdef CONFIG_DEVKMEM | 428 | #ifdef CONFIG_DEVKMEM |
| 432 | /* | 429 | /* |
| 433 | * This function reads the *virtual* memory as seen by the kernel. | 430 | * This function reads the *virtual* memory as seen by the kernel. |