diff --git a/[refs] b/[refs] index ee0de2ebf04a..263a43e95bf9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8e0aedc5bcb9da4f613af097295a02a57aa0d41c +refs/heads/master: a97145c22408865579be397460ca998301ab63a3 diff --git a/trunk/drivers/mtd/devices/pmc551.c b/trunk/drivers/mtd/devices/pmc551.c index d1cf66e0dced..7060a0895ce2 100644 --- a/trunk/drivers/mtd/devices/pmc551.c +++ b/trunk/drivers/mtd/devices/pmc551.c @@ -649,11 +649,7 @@ MODULE_DESCRIPTION(PMC551_VERSION); * Stuff these outside the ifdef so as to not bust compiled in driver support */ static int msize = 0; -#if defined(CONFIG_MTD_PMC551_APERTURE_SIZE) -static int asize = CONFIG_MTD_PMC551_APERTURE_SIZE; -#else static int asize = 0; -#endif module_param(msize, int, 0); MODULE_PARM_DESC(msize, "memory size in MiB [1 - 1024]");