git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.infradead.org/users/cbou/battery-2.6.36
[pandora-kernel.git]
/
drivers
/
block
/
xen-blkfront.c
diff --git
a/drivers/block/xen-blkfront.c
b/drivers/block/xen-blkfront.c
index
ac1b682
..
ab735a6
100644
(file)
--- a/
drivers/block/xen-blkfront.c
+++ b/
drivers/block/xen-blkfront.c
@@
-834,7
+834,7
@@
static int blkfront_probe(struct xenbus_device *dev,
char *type;
int len;
/* no unplug has been done: do not hook devices != xen vbds */
- if (xen_platform_pci_unplug & XEN_UNPLUG_
IGNORE
) {
+ if (xen_platform_pci_unplug & XEN_UNPLUG_
UNNECESSARY
) {
int major;
if (!VDEV_IS_EXTENDED(vdevice))