diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-18 14:15:05 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-18 14:15:05 -0500 |
| commit | 4092762aebfe55c1f8e31440b80a053c2dbe519b (patch) | |
| tree | 8fb9fd14131194174c12daf5d8195afd3b62bc3e /include/linux/connector.h | |
| parent | 745b1626dd71ce9661a05ea4db57859ed5c773d2 (diff) | |
| parent | 1de9e8e70f5acc441550ca75433563d91b269bbe (diff) | |
Merge branch 'tracing/ftrace'; commit 'v2.6.29-rc2' into tracing/core
Diffstat (limited to 'include/linux/connector.h')
| -rw-r--r-- | include/linux/connector.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/connector.h b/include/linux/connector.h index 5c7f9468f753..34f2789d9b9b 100644 --- a/include/linux/connector.h +++ b/include/linux/connector.h | |||
| @@ -22,7 +22,7 @@ | |||
| 22 | #ifndef __CONNECTOR_H | 22 | #ifndef __CONNECTOR_H |
| 23 | #define __CONNECTOR_H | 23 | #define __CONNECTOR_H |
| 24 | 24 | ||
| 25 | #include <asm/types.h> | 25 | #include <linux/types.h> |
| 26 | 26 | ||
| 27 | #define CN_IDX_CONNECTOR 0xffffffff | 27 | #define CN_IDX_CONNECTOR 0xffffffff |
| 28 | #define CN_VAL_CONNECTOR 0xffffffff | 28 | #define CN_VAL_CONNECTOR 0xffffffff |