Commit 60c06d75 authored by Linus Torvalds's avatar Linus Torvalds

uhhuh. Fix duplicate merge from -dj tree

parent 7d3edcdc
...@@ -210,18 +210,6 @@ static struct file_operations proc_partitions_operations = { ...@@ -210,18 +210,6 @@ static struct file_operations proc_partitions_operations = {
release: seq_release, release: seq_release,
}; };
extern struct seq_operations partitions_op;
static int partitions_open(struct inode *inode, struct file *file)
{
return seq_open(file, &partitions_op);
}
static struct file_operations proc_partitions_operations = {
open: partitions_open,
read: seq_read,
llseek: seq_lseek,
release: seq_release,
};
#ifdef CONFIG_MODULES #ifdef CONFIG_MODULES
extern struct seq_operations modules_op; extern struct seq_operations modules_op;
static int modules_open(struct inode *inode, struct file *file) static int modules_open(struct inode *inode, struct file *file)
......
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