diff options
Diffstat (limited to 'include/asm-i386')
-rw-r--r-- | include/asm-i386/mca_dma.h | 3 | ||||
-rw-r--r-- | include/asm-i386/topology.h | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-i386/mca_dma.h b/include/asm-i386/mca_dma.h index 4b3b526c5a3f..fbb1f3b71279 100644 --- a/include/asm-i386/mca_dma.h +++ b/include/asm-i386/mca_dma.h | |||
@@ -181,7 +181,7 @@ static __inline__ void mca_set_dma_io(unsigned int dmanr, unsigned int io_addr) | |||
181 | * @mode: mode to set | 181 | * @mode: mode to set |
182 | * | 182 | * |
183 | * The DMA controller supports several modes. The mode values you can | 183 | * The DMA controller supports several modes. The mode values you can |
184 | * set are : | 184 | * set are- |
185 | * | 185 | * |
186 | * %MCA_DMA_MODE_READ when reading from the DMA device. | 186 | * %MCA_DMA_MODE_READ when reading from the DMA device. |
187 | * | 187 | * |
@@ -190,7 +190,6 @@ static __inline__ void mca_set_dma_io(unsigned int dmanr, unsigned int io_addr) | |||
190 | * %MCA_DMA_MODE_IO to do DMA to or from an I/O port. | 190 | * %MCA_DMA_MODE_IO to do DMA to or from an I/O port. |
191 | * | 191 | * |
192 | * %MCA_DMA_MODE_16 to do 16bit transfers. | 192 | * %MCA_DMA_MODE_16 to do 16bit transfers. |
193 | * | ||
194 | */ | 193 | */ |
195 | 194 | ||
196 | static __inline__ void mca_set_dma_mode(unsigned int dmanr, unsigned int mode) | 195 | static __inline__ void mca_set_dma_mode(unsigned int dmanr, unsigned int mode) |
diff --git a/include/asm-i386/topology.h b/include/asm-i386/topology.h index 6adbd9b1ae88..978d09596130 100644 --- a/include/asm-i386/topology.h +++ b/include/asm-i386/topology.h | |||
@@ -74,6 +74,7 @@ static inline int node_to_first_cpu(int node) | |||
74 | #define SD_NODE_INIT (struct sched_domain) { \ | 74 | #define SD_NODE_INIT (struct sched_domain) { \ |
75 | .span = CPU_MASK_NONE, \ | 75 | .span = CPU_MASK_NONE, \ |
76 | .parent = NULL, \ | 76 | .parent = NULL, \ |
77 | .child = NULL, \ | ||
77 | .groups = NULL, \ | 78 | .groups = NULL, \ |
78 | .min_interval = 8, \ | 79 | .min_interval = 8, \ |
79 | .max_interval = 32, \ | 80 | .max_interval = 32, \ |