diff options
author | Tony Lindgren <tony@atomide.com> | 2011-05-24 09:45:06 +0200 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2011-05-24 09:45:06 +0200 |
commit | 9b28b11e2a648f07c8481b9666ccf1c088e1ab74 (patch) | |
tree | ac3db2d4ae69e393d8423bb8c9304c75023dc805 /drivers/block/xsysace.c | |
parent | Merge branch 'for-tony' of master.kernel.org:/pub/scm/linux/kernel/git/balbi/... (diff) | |
parent | OMAP3: PM: Boot message is not an error, and not helpful, remove it (diff) | |
download | linux-9b28b11e2a648f07c8481b9666ccf1c088e1ab74.tar.xz linux-9b28b11e2a648f07c8481b9666ccf1c088e1ab74.zip |
Merge branch 'for_2.6.40/pm-cleanup' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-linus
Diffstat (limited to 'drivers/block/xsysace.c')
-rw-r--r-- | drivers/block/xsysace.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/block/xsysace.c b/drivers/block/xsysace.c index 645ff765cd12..6c7fd7db6dff 100644 --- a/drivers/block/xsysace.c +++ b/drivers/block/xsysace.c @@ -1005,7 +1005,6 @@ static int __devinit ace_setup(struct ace_device *ace) ace->gd->major = ace_major; ace->gd->first_minor = ace->id * ACE_NUM_MINORS; ace->gd->fops = &ace_fops; - ace->gd->events = DISK_EVENT_MEDIA_CHANGE; ace->gd->queue = ace->queue; ace->gd->private_data = ace; snprintf(ace->gd->disk_name, 32, "xs%c", ace->id + 'a'); |