diff options
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/dmaengine.h | 2 | ||||
-rw-r--r-- | include/linux/jiffies.h | 2 | ||||
-rw-r--r-- | include/linux/mmzone.h | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h index b4d84ed6187d..d08a5c5eb928 100644 --- a/include/linux/dmaengine.h +++ b/include/linux/dmaengine.h | |||
@@ -404,7 +404,7 @@ static inline enum dma_status dma_async_is_tx_complete(struct dma_chan *chan, | |||
404 | * @last_used: last cookie value handed out | 404 | * @last_used: last cookie value handed out |
405 | * | 405 | * |
406 | * dma_async_is_complete() is used in dma_async_memcpy_complete() | 406 | * dma_async_is_complete() is used in dma_async_memcpy_complete() |
407 | * the test logic is seperated for lightweight testing of multiple cookies | 407 | * the test logic is separated for lightweight testing of multiple cookies |
408 | */ | 408 | */ |
409 | static inline enum dma_status dma_async_is_complete(dma_cookie_t cookie, | 409 | static inline enum dma_status dma_async_is_complete(dma_cookie_t cookie, |
410 | dma_cookie_t last_complete, dma_cookie_t last_used) | 410 | dma_cookie_t last_complete, dma_cookie_t last_used) |
diff --git a/include/linux/jiffies.h b/include/linux/jiffies.h index e377e34e589e..33ef710dac24 100644 --- a/include/linux/jiffies.h +++ b/include/linux/jiffies.h | |||
@@ -36,7 +36,7 @@ | |||
36 | #elif HZ >= 6144 && HZ < 12288 | 36 | #elif HZ >= 6144 && HZ < 12288 |
37 | # define SHIFT_HZ 13 | 37 | # define SHIFT_HZ 13 |
38 | #else | 38 | #else |
39 | # error You lose. | 39 | # error Invalid value of HZ. |
40 | #endif | 40 | #endif |
41 | 41 | ||
42 | /* LATCH is used in the interval timer and ftape setup. */ | 42 | /* LATCH is used in the interval timer and ftape setup. */ |
diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index 8d8d1977736e..9f274a687c7e 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h | |||
@@ -699,7 +699,6 @@ extern char numa_zonelist_order[]; | |||
699 | extern struct pglist_data contig_page_data; | 699 | extern struct pglist_data contig_page_data; |
700 | #define NODE_DATA(nid) (&contig_page_data) | 700 | #define NODE_DATA(nid) (&contig_page_data) |
701 | #define NODE_MEM_MAP(nid) mem_map | 701 | #define NODE_MEM_MAP(nid) mem_map |
702 | #define MAX_NODES_SHIFT 1 | ||
703 | 702 | ||
704 | #else /* CONFIG_NEED_MULTIPLE_NODES */ | 703 | #else /* CONFIG_NEED_MULTIPLE_NODES */ |
705 | 704 | ||