diff options
Diffstat (limited to 'arch/cris/include')
-rw-r--r-- | arch/cris/include/asm/Kbuild | 1 | ||||
-rw-r--r-- | arch/cris/include/asm/io.h | 1 | ||||
-rw-r--r-- | arch/cris/include/uapi/asm/socket.h | 2 |
3 files changed, 4 insertions, 0 deletions
diff --git a/arch/cris/include/asm/Kbuild b/arch/cris/include/asm/Kbuild index c8325455520e..b06caf649a95 100644 --- a/arch/cris/include/asm/Kbuild +++ b/arch/cris/include/asm/Kbuild | |||
@@ -11,3 +11,4 @@ generic-y += module.h | |||
11 | generic-y += trace_clock.h | 11 | generic-y += trace_clock.h |
12 | generic-y += vga.h | 12 | generic-y += vga.h |
13 | generic-y += xor.h | 13 | generic-y += xor.h |
14 | generic-y += preempt.h | ||
diff --git a/arch/cris/include/asm/io.h b/arch/cris/include/asm/io.h index 5d3047e5563b..4353cf239a13 100644 --- a/arch/cris/include/asm/io.h +++ b/arch/cris/include/asm/io.h | |||
@@ -3,6 +3,7 @@ | |||
3 | 3 | ||
4 | #include <asm/page.h> /* for __va, __pa */ | 4 | #include <asm/page.h> /* for __va, __pa */ |
5 | #include <arch/io.h> | 5 | #include <arch/io.h> |
6 | #include <asm-generic/iomap.h> | ||
6 | #include <linux/kernel.h> | 7 | #include <linux/kernel.h> |
7 | 8 | ||
8 | struct cris_io_operations | 9 | struct cris_io_operations |
diff --git a/arch/cris/include/uapi/asm/socket.h b/arch/cris/include/uapi/asm/socket.h index eb723e51554e..13829aaaeec5 100644 --- a/arch/cris/include/uapi/asm/socket.h +++ b/arch/cris/include/uapi/asm/socket.h | |||
@@ -78,6 +78,8 @@ | |||
78 | 78 | ||
79 | #define SO_BUSY_POLL 46 | 79 | #define SO_BUSY_POLL 46 |
80 | 80 | ||
81 | #define SO_MAX_PACING_RATE 47 | ||
82 | |||
81 | #endif /* _ASM_SOCKET_H */ | 83 | #endif /* _ASM_SOCKET_H */ |
82 | 84 | ||
83 | 85 | ||