diff options
| -rw-r--r-- | drivers/parport/Kconfig | 2 | ||||
| -rw-r--r-- | mm/shmem.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/parport/Kconfig b/drivers/parport/Kconfig index f63c387976cf..6c8452ede0e1 100644 --- a/drivers/parport/Kconfig +++ b/drivers/parport/Kconfig @@ -48,7 +48,7 @@ config PARPORT_PC config PARPORT_SERIAL tristate "Multi-IO cards (parallel and serial)" - depends on SERIAL_8250 && PARPORT_PC && PCI + depends on SERIAL_8250_PCI && PARPORT_PC && PCI help This adds support for multi-IO PCI cards that have parallel and serial ports. You should say Y or M here. If you say M, the module diff --git a/mm/shmem.c b/mm/shmem.c index f0eb2f265ebe..1bc2285f7469 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -2100,6 +2100,7 @@ static int shmem_fill_super(struct super_block *sb, sb->s_blocksize_bits = PAGE_CACHE_SHIFT; sb->s_magic = TMPFS_MAGIC; sb->s_op = &shmem_ops; + sb->s_time_gran = 1; inode = shmem_get_inode(sb, S_IFDIR | mode, 0); if (!inode) |