diff options
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/fsl_devices.h | 5 | ||||
-rw-r--r-- | include/linux/vmalloc.h | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/include/linux/fsl_devices.h b/include/linux/fsl_devices.h index 73710d617775..12e631f0fb77 100644 --- a/include/linux/fsl_devices.h +++ b/include/linux/fsl_devices.h | |||
@@ -120,5 +120,10 @@ struct fsl_spi_platform_data { | |||
120 | u32 sysclk; | 120 | u32 sysclk; |
121 | }; | 121 | }; |
122 | 122 | ||
123 | struct mpc8xx_pcmcia_ops { | ||
124 | void(*hw_ctrl)(int slot, int enable); | ||
125 | int(*voltage_set)(int slot, int vcc, int vpp); | ||
126 | }; | ||
127 | |||
123 | #endif /* _FSL_DEVICE_H_ */ | 128 | #endif /* _FSL_DEVICE_H_ */ |
124 | #endif /* __KERNEL__ */ | 129 | #endif /* __KERNEL__ */ |
diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h index 4b7ee83787c1..132b260aef1e 100644 --- a/include/linux/vmalloc.h +++ b/include/linux/vmalloc.h | |||
@@ -65,9 +65,10 @@ extern struct vm_struct *get_vm_area_node(unsigned long size, | |||
65 | unsigned long flags, int node, | 65 | unsigned long flags, int node, |
66 | gfp_t gfp_mask); | 66 | gfp_t gfp_mask); |
67 | extern struct vm_struct *remove_vm_area(void *addr); | 67 | extern struct vm_struct *remove_vm_area(void *addr); |
68 | |||
68 | extern int map_vm_area(struct vm_struct *area, pgprot_t prot, | 69 | extern int map_vm_area(struct vm_struct *area, pgprot_t prot, |
69 | struct page ***pages); | 70 | struct page ***pages); |
70 | extern void unmap_vm_area(struct vm_struct *area); | 71 | extern void unmap_kernel_range(unsigned long addr, unsigned long size); |
71 | 72 | ||
72 | /* | 73 | /* |
73 | * Internals. Dont't use.. | 74 | * Internals. Dont't use.. |