Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
	Documentation/feature-removal-schedule.txt
	drivers/net/e1000e/netdev.c
	net/xfrm/xfrm_policy.c

1 files changed, 10 insertions, 10 deletions

diff --git a/drivers/video/fbsysfs.c b/drivers/video/fbsysfs.c
index 0a08f1341227..f4a32779168b 100644
--- a/drivers/video/fbsysfs.c
+++ b/drivers/video/fbsysfs.c
@@ -90,11 +90,11 @@ static int activate(struct fb_info *fb_info, struct fb_var_screeninfo *var)
         int err;
 
         var->activate |= FB_ACTIVATE_FORCE;
-        acquire_console_sem();
+        console_lock();
         fb_info->flags |= FBINFO_MISC_USEREVENT;
         err = fb_set_var(fb_info, var);
         fb_info->flags &= ~FBINFO_MISC_USEREVENT;
-        release_console_sem();
+        console_unlock();
         if (err)
                 return err;
         return 0;
@@ -175,7 +175,7 @@ static ssize_t store_modes(struct device *device,
         if (i * sizeof(struct fb_videomode) != count)
                 return -EINVAL;
 
-        acquire_console_sem();
+        console_lock();
         list_splice(&fb_info->modelist, &old_list);
         fb_videomode_to_modelist((const struct fb_videomode *)buf, i,
                                  &fb_info->modelist);
@@ -185,7 +185,7 @@ static ssize_t store_modes(struct device *device,
         } else
                 fb_destroy_modelist(&old_list);
 
-        release_console_sem();
+        console_unlock();
 
         return 0;
 }
@@ -301,11 +301,11 @@ static ssize_t store_blank(struct device *device,
         char *last = NULL;
         int err;
 
-        acquire_console_sem();
+        console_lock();
         fb_info->flags |= FBINFO_MISC_USEREVENT;
         err = fb_blank(fb_info, simple_strtoul(buf, &last, 0));
         fb_info->flags &= ~FBINFO_MISC_USEREVENT;
-        release_console_sem();
+        console_unlock();
         if (err < 0)
                 return err;
         return count;
@@ -364,9 +364,9 @@ static ssize_t store_pan(struct device *device,
                 return -EINVAL;
         var.yoffset = simple_strtoul(last, &last, 0);
 
-        acquire_console_sem();
+        console_lock();
         err = fb_pan_display(fb_info, &var);
-        release_console_sem();
+        console_unlock();
 
         if (err < 0)
                 return err;
@@ -399,9 +399,9 @@ static ssize_t store_fbstate(struct device *device,
 
         state = simple_strtoul(buf, &last, 0);
 
-        acquire_console_sem();
+        console_lock();
         fb_set_suspend(fb_info, (int)state);
-        release_console_sem();
+        console_unlock();
 
         return count;
 }