Commit 79bcb732 authored by Trond Myklebust's avatar Trond Myklebust

Merge http://nfsclient.bkbits.net/linux-2.5

into fys.uio.no:/home/linux/bitkeeper/nfsclient-2.5
parents 461704b1 ad556f8f
...@@ -6,7 +6,7 @@ menu "Character devices" ...@@ -6,7 +6,7 @@ menu "Character devices"
config VT config VT
bool "Virtual terminal" if EMBEDDED bool "Virtual terminal" if EMBEDDED
requires INPUT=y select INPUT
default y default y
---help--- ---help---
If you say Y here, you will get support for terminal devices with If you say Y here, you will get support for terminal devices with
......
...@@ -647,7 +647,6 @@ static void __exit exit_sedlbauer_cs(void) ...@@ -647,7 +647,6 @@ static void __exit exit_sedlbauer_cs(void)
/* XXX: this really needs to move into generic code.. */ /* XXX: this really needs to move into generic code.. */
while (dev_list != NULL) { while (dev_list != NULL) {
del_timer(&dev_list->release);
if (dev_list->state & DEV_CONFIG) if (dev_list->state & DEV_CONFIG)
sedlbauer_release(dev_list); sedlbauer_release(dev_list);
sedlbauer_detach(dev_list); sedlbauer_detach(dev_list);
......
...@@ -252,6 +252,7 @@ static int kallsyms_open(struct inode *inode, struct file *file) ...@@ -252,6 +252,7 @@ static int kallsyms_open(struct inode *inode, struct file *file)
iter = kmalloc(sizeof(*iter), GFP_KERNEL); iter = kmalloc(sizeof(*iter), GFP_KERNEL);
if (!iter) if (!iter)
return -ENOMEM; return -ENOMEM;
reset_iter(iter);
ret = seq_open(file, &kallsyms_op); ret = seq_open(file, &kallsyms_op);
if (ret == 0) if (ret == 0)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment