diff options
Diffstat (limited to 'arch/mn10300/include')
-rw-r--r-- | arch/mn10300/include/asm/highmem.h | 2 | ||||
-rw-r--r-- | arch/mn10300/include/asm/pci.h | 16 | ||||
-rw-r--r-- | arch/mn10300/include/asm/reset-regs.h | 4 | ||||
-rw-r--r-- | arch/mn10300/include/asm/socket.h | 4 |
4 files changed, 5 insertions, 21 deletions
diff --git a/arch/mn10300/include/asm/highmem.h b/arch/mn10300/include/asm/highmem.h index bfe2d88604d9..7c137cd8aa37 100644 --- a/arch/mn10300/include/asm/highmem.h +++ b/arch/mn10300/include/asm/highmem.h | |||
@@ -70,7 +70,7 @@ static inline void kunmap(struct page *page) | |||
70 | * be used in IRQ contexts, so in some (very limited) cases we need | 70 | * be used in IRQ contexts, so in some (very limited) cases we need |
71 | * it. | 71 | * it. |
72 | */ | 72 | */ |
73 | static inline unsigned long __kmap_atomic(struct page *page) | 73 | static inline unsigned long kmap_atomic(struct page *page) |
74 | { | 74 | { |
75 | unsigned long vaddr; | 75 | unsigned long vaddr; |
76 | int idx, type; | 76 | int idx, type; |
diff --git a/arch/mn10300/include/asm/pci.h b/arch/mn10300/include/asm/pci.h index 6095a28561dd..8137c25c4e15 100644 --- a/arch/mn10300/include/asm/pci.h +++ b/arch/mn10300/include/asm/pci.h | |||
@@ -85,22 +85,6 @@ extern int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma, | |||
85 | /* implement the pci_ DMA API in terms of the generic device dma_ one */ | 85 | /* implement the pci_ DMA API in terms of the generic device dma_ one */ |
86 | #include <asm-generic/pci-dma-compat.h> | 86 | #include <asm-generic/pci-dma-compat.h> |
87 | 87 | ||
88 | /** | ||
89 | * pcibios_resource_to_bus - convert resource to PCI bus address | ||
90 | * @dev: device which owns this resource | ||
91 | * @region: converted bus-centric region (start,end) | ||
92 | * @res: resource to convert | ||
93 | * | ||
94 | * Convert a resource to a PCI device bus address or bus window. | ||
95 | */ | ||
96 | extern void pcibios_resource_to_bus(struct pci_dev *dev, | ||
97 | struct pci_bus_region *region, | ||
98 | struct resource *res); | ||
99 | |||
100 | extern void pcibios_bus_to_resource(struct pci_dev *dev, | ||
101 | struct resource *res, | ||
102 | struct pci_bus_region *region); | ||
103 | |||
104 | static inline struct resource * | 88 | static inline struct resource * |
105 | pcibios_select_root(struct pci_dev *pdev, struct resource *res) | 89 | pcibios_select_root(struct pci_dev *pdev, struct resource *res) |
106 | { | 90 | { |
diff --git a/arch/mn10300/include/asm/reset-regs.h b/arch/mn10300/include/asm/reset-regs.h index 10c7502a113f..8ca2a42d365b 100644 --- a/arch/mn10300/include/asm/reset-regs.h +++ b/arch/mn10300/include/asm/reset-regs.h | |||
@@ -17,10 +17,6 @@ | |||
17 | 17 | ||
18 | #ifdef __KERNEL__ | 18 | #ifdef __KERNEL__ |
19 | 19 | ||
20 | #ifdef CONFIG_MN10300_WD_TIMER | ||
21 | #define ARCH_HAS_NMI_WATCHDOG /* See include/linux/nmi.h */ | ||
22 | #endif | ||
23 | |||
24 | /* | 20 | /* |
25 | * watchdog timer registers | 21 | * watchdog timer registers |
26 | */ | 22 | */ |
diff --git a/arch/mn10300/include/asm/socket.h b/arch/mn10300/include/asm/socket.h index 876356d78522..820463a484b8 100644 --- a/arch/mn10300/include/asm/socket.h +++ b/arch/mn10300/include/asm/socket.h | |||
@@ -64,5 +64,9 @@ | |||
64 | 64 | ||
65 | #define SO_WIFI_STATUS 41 | 65 | #define SO_WIFI_STATUS 41 |
66 | #define SCM_WIFI_STATUS SO_WIFI_STATUS | 66 | #define SCM_WIFI_STATUS SO_WIFI_STATUS |
67 | #define SO_PEEK_OFF 42 | ||
68 | |||
69 | /* Instruct lower device to use last 4-bytes of skb data as FCS */ | ||
70 | #define SO_NOFCS 43 | ||
67 | 71 | ||
68 | #endif /* _ASM_SOCKET_H */ | 72 | #endif /* _ASM_SOCKET_H */ |