Merge branch 'linux-2.6'

This commit is contained in:
Paul Mackerras 2008-01-24 10:07:21 +11:00
commit 9156ad4833
459 changed files with 4199 additions and 3005 deletions

View file

@ -52,7 +52,7 @@ void sunserial_unregister_minors(struct uart_driver *drv, int count)
}
EXPORT_SYMBOL(sunserial_unregister_minors);
int __init sunserial_console_match(struct console *con, struct device_node *dp,
int sunserial_console_match(struct console *con, struct device_node *dp,
struct uart_driver *drv, int line)
{
int off;