void __iomem *base;
        unsigned char hold;     /* in gbusclock */
        unsigned char spw;      /* in gbusclock */
-       struct nand_controller hw_control;
+       struct nand_controller controller;
 };
 
 static struct platform_device *mtd_to_platdev(struct mtd_info *mtd)
        dev_info(&dev->dev, "CLK:%ldMHz HOLD:%d SPW:%d\n",
                 (gbusclk + 500000) / 1000000, hold, spw);
 
-       nand_controller_init(&drvdata->hw_control);
+       nand_controller_init(&drvdata->controller);
 
        platform_set_drvdata(dev, drvdata);
        txx9ndfmc_initialize(dev);
                chip->ecc.bytes = 3;
                chip->ecc.strength = 1;
                chip->chip_delay = 100;
-               chip->controller = &drvdata->hw_control;
+               chip->controller = &drvdata->controller;
 
                nand_set_controller_data(chip, txx9_priv);
                txx9_priv->dev = dev;