Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/char/snsc.c b/drivers/char/snsc.c
index 1758a83327e5..0e7d216e7eb0 100644
--- a/drivers/char/snsc.c
+++ b/drivers/char/snsc.c
@@ -377,7 +377,7 @@ scdrv_init(void)
         dev_t first_dev, dev;
         nasid_t event_nasid = ia64_sn_get_console_nasid();
 
-        if (alloc_chrdev_region(&first_dev, 0, numionodes,
+        if (alloc_chrdev_region(&first_dev, 0, num_cnodes,
                                 SYSCTL_BASENAME) < 0) {
                 printk("%s: failed to register SN system controller device\n",
                        __FUNCTION__);
@@ -385,7 +385,7 @@ scdrv_init(void)
         }
         snsc_class = class_create(THIS_MODULE, SYSCTL_BASENAME);
 
-        for (cnode = 0; cnode < numionodes; cnode++) {
+        for (cnode = 0; cnode < num_cnodes; cnode++) {
                         geoid = cnodeid_get_geoid(cnode);
                         devnamep = devname;
                         format_module_id(devnamep, geo_module(geoid),