diff options
Diffstat (limited to 'drivers/char/mem.c')
| -rw-r--r-- | drivers/char/mem.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/char/mem.c b/drivers/char/mem.c index 0f67f6e8b..d0c5eefe3 100644 --- a/drivers/char/mem.c +++ b/drivers/char/mem.c @@ -13,12 +13,13 @@ #include <linux/miscdevice.h> #include <linux/tpqic02.h> #include <linux/ftape.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/vmalloc.h> #include <linux/mman.h> #include <linux/random.h> #include <linux/init.h> #include <linux/raw.h> +#include <linux/tty.h> #include <linux/capability.h> #include <asm/uaccess.h> @@ -28,9 +29,6 @@ #ifdef CONFIG_I2C extern int i2c_init_all(void); #endif -#ifdef CONFIG_ISDN -int isdn_init(void); -#endif #ifdef CONFIG_VIDEO_DEV extern int videodev_init(void); #endif @@ -157,9 +155,6 @@ static inline pgprot_t pgprot_noncached(pgprot_t _prot) prot = (prot & _CACHEMASK040) | _PAGE_NOCACHE_S; #elif defined(__mips__) prot = (prot & ~_CACHE_MASK) | _CACHE_UNCACHED; -#elif defined(__arm__) && defined(CONFIG_CPU_32) - /* Turn off caching for all I/O areas */ - prot &= ~(L_PTE_CACHEABLE | L_PTE_BUFFERABLE); #endif return __pgprot(prot); @@ -646,9 +641,6 @@ int __init chr_dev_init(void) #if CONFIG_QIC02_TAPE qic02_tape_init(); #endif -#if CONFIG_ISDN - isdn_init(); -#endif #ifdef CONFIG_FTAPE ftape_init(); #endif |