diff options
| author | Dave Jones <davej@tetrachloride.(none)> | 2002-12-29 10:04:08 -0100 |
|---|---|---|
| committer | Dave Jones <davej@tetrachloride.(none)> | 2002-12-29 10:04:08 -0100 |
| commit | 20b2d4006542bdb0673c3c2ebcf83d7b69a75104 (patch) | |
| tree | aac41b6f802abff56051f9208995ea2c1c682aad /kernel | |
| parent | 7d255ace78aea45470605bec357098280f885147 (diff) | |
| parent | 0e3a6c7d8bfc8a1b3d947334b74154ca341dc51b (diff) | |
Merge tetrachloride.(none):/mnt/stuff/kernel/2.5/bk-linus
into tetrachloride.(none):/mnt/stuff/kernel/2.5/agpgart
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/printk.c | 2 | ||||
| -rw-r--r-- | kernel/resource.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/kernel/printk.c b/kernel/printk.c index cbe027aaf151..bb1bcb0d723f 100644 --- a/kernel/printk.c +++ b/kernel/printk.c @@ -638,7 +638,7 @@ void register_console(struct console * console) } if (console->flags & CON_PRINTBUFFER) { /* - * release_cosole_sem() will print out the buffered messages for us. + * release_console_sem() will print out the buffered messages for us. */ spin_lock_irqsave(&logbuf_lock, flags); con_start = log_start; diff --git a/kernel/resource.c b/kernel/resource.c index 9664ad073db7..7e23211ac0a9 100644 --- a/kernel/resource.c +++ b/kernel/resource.c @@ -237,7 +237,7 @@ struct resource * __request_region(struct resource *parent, unsigned long start, return res; } -int __check_region(struct resource *parent, unsigned long start, unsigned long n) +int deprecated __check_region(struct resource *parent, unsigned long start, unsigned long n) { struct resource * res; |