diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-09-15 09:08:05 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-09-15 09:08:18 -0400 |
| commit | e060c38434b2caa78efe7cedaff4191040b65a15 (patch) | |
| tree | 407361230bf6733f63d8e788e4b5e6566ee04818 /include/linux/connector.h | |
| parent | 10e4ac572eeffe5317019bd7330b6058a400dfc2 (diff) | |
| parent | cc39c6a9bbdebfcf1a7dee64d83bf302bc38d941 (diff) | |
Merge branch 'master' into for-next
Fast-forward merge with Linus to be able to merge patches
based on more recent version of the tree.
Diffstat (limited to 'include/linux/connector.h')
| -rw-r--r-- | include/linux/connector.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/connector.h b/include/linux/connector.h index f696bccd48cb..3c9c54fd5690 100644 --- a/include/linux/connector.h +++ b/include/linux/connector.h | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * connector.h | 2 | * connector.h |
| 3 | * | 3 | * |
| 4 | * 2004-2005 Copyright (c) Evgeniy Polyakov <johnpol@2ka.mipt.ru> | 4 | * 2004-2005 Copyright (c) Evgeniy Polyakov <zbr@ioremap.net> |
| 5 | * All rights reserved. | 5 | * All rights reserved. |
| 6 | * | 6 | * |
| 7 | * This program is free software; you can redistribute it and/or modify | 7 | * This program is free software; you can redistribute it and/or modify |
| @@ -75,7 +75,7 @@ struct cn_msg { | |||
| 75 | 75 | ||
| 76 | #ifdef __KERNEL__ | 76 | #ifdef __KERNEL__ |
| 77 | 77 | ||
| 78 | #include <asm/atomic.h> | 78 | #include <linux/atomic.h> |
| 79 | 79 | ||
| 80 | #include <linux/list.h> | 80 | #include <linux/list.h> |
| 81 | #include <linux/workqueue.h> | 81 | #include <linux/workqueue.h> |