summaryrefslogtreecommitdiff
path: root/cleopatre/linux-2.6.25.10-spc300/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'cleopatre/linux-2.6.25.10-spc300/drivers')
-rw-r--r--cleopatre/linux-2.6.25.10-spc300/drivers/gpio/spc300_gpio.c4
-rw-r--r--cleopatre/linux-2.6.25.10-spc300/drivers/mtd/devices/m25p80.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/cleopatre/linux-2.6.25.10-spc300/drivers/gpio/spc300_gpio.c b/cleopatre/linux-2.6.25.10-spc300/drivers/gpio/spc300_gpio.c
index caa9dd85ce..849dd4ef2b 100644
--- a/cleopatre/linux-2.6.25.10-spc300/drivers/gpio/spc300_gpio.c
+++ b/cleopatre/linux-2.6.25.10-spc300/drivers/gpio/spc300_gpio.c
@@ -757,10 +757,10 @@ __init spc300_gpio_probe (struct platform_device *pdev)
}
/* Setup GPIO interrupts */
- for (num = 0; num < spc300_gpio_max_nb (spc300_nvram.pkg_cfg); num++)
+ for (num = 0; num < spc300_gpio_max_nb (spidcom_nvram.pkg_cfg); num++)
{
if (SPC300_GPIO_DIRECTION_INPUT == \
- spc300_gpio_direction (spc300_nvram.gpio_allow_dir, num))
+ spc300_gpio_direction (spidcom_nvram.gpio_allow_dir, num))
spc300_gpio_set_interrupt (num, 1, 1);
}
diff --git a/cleopatre/linux-2.6.25.10-spc300/drivers/mtd/devices/m25p80.c b/cleopatre/linux-2.6.25.10-spc300/drivers/mtd/devices/m25p80.c
index da13634707..f1dd15e25f 100644
--- a/cleopatre/linux-2.6.25.10-spc300/drivers/mtd/devices/m25p80.c
+++ b/cleopatre/linux-2.6.25.10-spc300/drivers/mtd/devices/m25p80.c
@@ -653,10 +653,10 @@ static int __devinit m25p_probe(struct spi_device *spi)
#ifdef CONFIG_ARCH_SPC300
{
m25pgeneric.n_sectors =
- (1 << NVRAM_BFEXT (FLASH_NB_SECT, spc300_nvram.flash_org));
+ (1 << NVRAM_BFEXT (FLASH_NB_SECT, spidcom_nvram.flash_org));
m25pgeneric.sector_size =
((64 * 1024) *
- (NVRAM_BFEXT (FLASH_SECT_SZ, spc300_nvram.flash_org) + 1));
+ (NVRAM_BFEXT (FLASH_SECT_SZ, spidcom_nvram.flash_org) + 1));
info = &m25pgeneric;
dev_warn(&spi->dev,
"Using flash architecture given by NVRAM (%u sectors of %uKBytes)\n",