git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
drivers
/
xen
/
xenbus
/
xenbus_dev.c
diff --git
a/drivers/xen/xenbus/xenbus_dev.c
b/drivers/xen/xenbus/xenbus_dev.c
index
02d3b46
..
c95c48b
100644
(file)
--- a/
drivers/xen/xenbus/xenbus_dev.c
+++ b/
drivers/xen/xenbus/xenbus_dev.c
@@
-32,7
+32,6
@@
* IN THE SOFTWARE.
*/
* IN THE SOFTWARE.
*/
-#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/errno.h>
#include <linux/uio.h>
#include <linux/kernel.h>
#include <linux/errno.h>
#include <linux/uio.h>
@@
-285,7
+284,7
@@
static int xenbus_dev_open(struct inode *inode, struct file *filp)
{
struct xenbus_dev_data *u;
{
struct xenbus_dev_data *u;
- if (xen_st
art_info->st
ore_evtchn == 0)
+ if (xen_store_evtchn == 0)
return -ENOENT;
nonseekable_open(inode, filp);
return -ENOENT;
nonseekable_open(inode, filp);
@@
-346,7
+345,7
@@
static struct file_operations xenbus_dev_file_ops = {
.poll = xenbus_dev_poll,
};
.poll = xenbus_dev_poll,
};
-
static
int __init
+int __init
xenbus_dev_init(void)
{
xenbus_dev_intf = create_xen_proc_entry("xenbus", 0400);
xenbus_dev_init(void)
{
xenbus_dev_intf = create_xen_proc_entry("xenbus", 0400);
@@
-355,5
+354,3
@@
xenbus_dev_init(void)
return 0;
}
return 0;
}
-
-__initcall(xenbus_dev_init);