diff options
| -rw-r--r-- | arch/parisc/configs/712_defconfig | 2 | ||||
| -rw-r--r-- | arch/parisc/configs/a500_defconfig | 2 | ||||
| -rw-r--r-- | arch/parisc/configs/b180_defconfig | 3 | ||||
| -rw-r--r-- | arch/parisc/configs/c3000_defconfig | 3 | ||||
| -rw-r--r-- | arch/parisc/configs/c8000_defconfig | 2 | ||||
| -rw-r--r-- | arch/parisc/configs/default_defconfig | 2 | ||||
| -rw-r--r-- | arch/parisc/kernel/cache.c | 1 |
7 files changed, 14 insertions, 1 deletions
diff --git a/arch/parisc/configs/712_defconfig b/arch/parisc/configs/712_defconfig index 0f90569b9d85..9387cc2693f6 100644 --- a/arch/parisc/configs/712_defconfig +++ b/arch/parisc/configs/712_defconfig | |||
| @@ -40,6 +40,8 @@ CONFIG_IP_NF_QUEUE=m | |||
| 40 | CONFIG_LLC2=m | 40 | CONFIG_LLC2=m |
| 41 | CONFIG_NET_PKTGEN=m | 41 | CONFIG_NET_PKTGEN=m |
| 42 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 42 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
| 43 | CONFIG_DEVTMPFS=y | ||
| 44 | CONFIG_DEVTMPFS_MOUNT=y | ||
| 43 | # CONFIG_STANDALONE is not set | 45 | # CONFIG_STANDALONE is not set |
| 44 | # CONFIG_PREVENT_FIRMWARE_BUILD is not set | 46 | # CONFIG_PREVENT_FIRMWARE_BUILD is not set |
| 45 | CONFIG_PARPORT=y | 47 | CONFIG_PARPORT=y |
diff --git a/arch/parisc/configs/a500_defconfig b/arch/parisc/configs/a500_defconfig index b647b182dacc..90025322b75e 100644 --- a/arch/parisc/configs/a500_defconfig +++ b/arch/parisc/configs/a500_defconfig | |||
| @@ -79,6 +79,8 @@ CONFIG_IP_DCCP=m | |||
| 79 | CONFIG_LLC2=m | 79 | CONFIG_LLC2=m |
| 80 | CONFIG_NET_PKTGEN=m | 80 | CONFIG_NET_PKTGEN=m |
| 81 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 81 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
| 82 | CONFIG_DEVTMPFS=y | ||
| 83 | CONFIG_DEVTMPFS_MOUNT=y | ||
| 82 | # CONFIG_STANDALONE is not set | 84 | # CONFIG_STANDALONE is not set |
| 83 | # CONFIG_PREVENT_FIRMWARE_BUILD is not set | 85 | # CONFIG_PREVENT_FIRMWARE_BUILD is not set |
| 84 | CONFIG_BLK_DEV_UMEM=m | 86 | CONFIG_BLK_DEV_UMEM=m |
diff --git a/arch/parisc/configs/b180_defconfig b/arch/parisc/configs/b180_defconfig index e289f5bf3148..f1a0c25bef8d 100644 --- a/arch/parisc/configs/b180_defconfig +++ b/arch/parisc/configs/b180_defconfig | |||
| @@ -4,6 +4,7 @@ CONFIG_IKCONFIG=y | |||
| 4 | CONFIG_IKCONFIG_PROC=y | 4 | CONFIG_IKCONFIG_PROC=y |
| 5 | CONFIG_LOG_BUF_SHIFT=16 | 5 | CONFIG_LOG_BUF_SHIFT=16 |
| 6 | CONFIG_SYSFS_DEPRECATED_V2=y | 6 | CONFIG_SYSFS_DEPRECATED_V2=y |
| 7 | CONFIG_BLK_DEV_INITRD=y | ||
| 7 | CONFIG_SLAB=y | 8 | CONFIG_SLAB=y |
| 8 | CONFIG_MODULES=y | 9 | CONFIG_MODULES=y |
| 9 | CONFIG_MODVERSIONS=y | 10 | CONFIG_MODVERSIONS=y |
| @@ -27,6 +28,8 @@ CONFIG_IP_PNP_BOOTP=y | |||
| 27 | # CONFIG_INET_LRO is not set | 28 | # CONFIG_INET_LRO is not set |
| 28 | CONFIG_IPV6=y | 29 | CONFIG_IPV6=y |
| 29 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 30 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
| 31 | CONFIG_DEVTMPFS=y | ||
| 32 | CONFIG_DEVTMPFS_MOUNT=y | ||
| 30 | # CONFIG_PREVENT_FIRMWARE_BUILD is not set | 33 | # CONFIG_PREVENT_FIRMWARE_BUILD is not set |
| 31 | CONFIG_PARPORT=y | 34 | CONFIG_PARPORT=y |
| 32 | CONFIG_PARPORT_PC=y | 35 | CONFIG_PARPORT_PC=y |
diff --git a/arch/parisc/configs/c3000_defconfig b/arch/parisc/configs/c3000_defconfig index 311ca367b622..ec1b014952b6 100644 --- a/arch/parisc/configs/c3000_defconfig +++ b/arch/parisc/configs/c3000_defconfig | |||
| @@ -5,6 +5,7 @@ CONFIG_IKCONFIG=y | |||
| 5 | CONFIG_IKCONFIG_PROC=y | 5 | CONFIG_IKCONFIG_PROC=y |
| 6 | CONFIG_LOG_BUF_SHIFT=16 | 6 | CONFIG_LOG_BUF_SHIFT=16 |
| 7 | CONFIG_SYSFS_DEPRECATED_V2=y | 7 | CONFIG_SYSFS_DEPRECATED_V2=y |
| 8 | CONFIG_BLK_DEV_INITRD=y | ||
| 8 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 9 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 9 | CONFIG_EXPERT=y | 10 | CONFIG_EXPERT=y |
| 10 | CONFIG_KALLSYMS_ALL=y | 11 | CONFIG_KALLSYMS_ALL=y |
| @@ -39,6 +40,8 @@ CONFIG_NETFILTER_DEBUG=y | |||
| 39 | CONFIG_IP_NF_QUEUE=m | 40 | CONFIG_IP_NF_QUEUE=m |
| 40 | CONFIG_NET_PKTGEN=m | 41 | CONFIG_NET_PKTGEN=m |
| 41 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 42 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
| 43 | CONFIG_DEVTMPFS=y | ||
| 44 | CONFIG_DEVTMPFS_MOUNT=y | ||
| 42 | # CONFIG_STANDALONE is not set | 45 | # CONFIG_STANDALONE is not set |
| 43 | # CONFIG_PREVENT_FIRMWARE_BUILD is not set | 46 | # CONFIG_PREVENT_FIRMWARE_BUILD is not set |
| 44 | CONFIG_BLK_DEV_UMEM=m | 47 | CONFIG_BLK_DEV_UMEM=m |
diff --git a/arch/parisc/configs/c8000_defconfig b/arch/parisc/configs/c8000_defconfig index f11006361297..e1c8d2015c89 100644 --- a/arch/parisc/configs/c8000_defconfig +++ b/arch/parisc/configs/c8000_defconfig | |||
| @@ -62,6 +62,8 @@ CONFIG_TIPC=m | |||
| 62 | CONFIG_LLC2=m | 62 | CONFIG_LLC2=m |
| 63 | CONFIG_DNS_RESOLVER=y | 63 | CONFIG_DNS_RESOLVER=y |
| 64 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 64 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
| 65 | CONFIG_DEVTMPFS=y | ||
| 66 | CONFIG_DEVTMPFS_MOUNT=y | ||
| 65 | # CONFIG_STANDALONE is not set | 67 | # CONFIG_STANDALONE is not set |
| 66 | CONFIG_PARPORT=y | 68 | CONFIG_PARPORT=y |
| 67 | CONFIG_PARPORT_PC=y | 69 | CONFIG_PARPORT_PC=y |
diff --git a/arch/parisc/configs/default_defconfig b/arch/parisc/configs/default_defconfig index dfe88f6c95c4..ba61495e1fa4 100644 --- a/arch/parisc/configs/default_defconfig +++ b/arch/parisc/configs/default_defconfig | |||
| @@ -49,6 +49,8 @@ CONFIG_INET6_ESP=y | |||
| 49 | CONFIG_INET6_IPCOMP=y | 49 | CONFIG_INET6_IPCOMP=y |
| 50 | CONFIG_LLC2=m | 50 | CONFIG_LLC2=m |
| 51 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 51 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
| 52 | CONFIG_DEVTMPFS=y | ||
| 53 | CONFIG_DEVTMPFS_MOUNT=y | ||
| 52 | # CONFIG_STANDALONE is not set | 54 | # CONFIG_STANDALONE is not set |
| 53 | # CONFIG_PREVENT_FIRMWARE_BUILD is not set | 55 | # CONFIG_PREVENT_FIRMWARE_BUILD is not set |
| 54 | CONFIG_PARPORT=y | 56 | CONFIG_PARPORT=y |
diff --git a/arch/parisc/kernel/cache.c b/arch/parisc/kernel/cache.c index b521c0adf4ec..c035673209f7 100644 --- a/arch/parisc/kernel/cache.c +++ b/arch/parisc/kernel/cache.c | |||
| @@ -602,7 +602,6 @@ flush_cache_page(struct vm_area_struct *vma, unsigned long vmaddr, unsigned long | |||
| 602 | __flush_cache_page(vma, vmaddr, PFN_PHYS(pfn)); | 602 | __flush_cache_page(vma, vmaddr, PFN_PHYS(pfn)); |
| 603 | } | 603 | } |
| 604 | } | 604 | } |
| 605 | EXPORT_SYMBOL_GPL(flush_cache_page); | ||
| 606 | 605 | ||
| 607 | #ifdef CONFIG_PARISC_TMPALIAS | 606 | #ifdef CONFIG_PARISC_TMPALIAS |
| 608 | 607 | ||
