diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-24 13:04:05 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-24 13:04:05 -0400 |
| commit | 4d4fcae1d4a10c6cf3c8ca2ec61d2d3270f1225e (patch) | |
| tree | fb09c210f8402cb7201b6ae4797343adcf4b73ac /drivers/sh/intc/internals.h | |
| parent | b4a41ed24c858d75985c7dcba685715fdf2e6114 (diff) | |
| parent | b15ed691667f59867c9c130b8d84feda4050be04 (diff) | |
Merge branch 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
sh: Fix build alloc_thread_info_node function
sh: Fix ptrace hw_breakpoint handling
sh: Fix ptrace fpu state initialisation
sh: Re-enable GENERIC_HARDIRQS_NO_DEPRECATED.
sh: pmb: Use struct syscore_ops instead of sysdevs
sh: Use struct syscore_ops instead of sysdevs
sh: Conver to asm-generic/sizes.h.
sh: wire up sys_syncfs.
Diffstat (limited to 'drivers/sh/intc/internals.h')
| -rw-r--r-- | drivers/sh/intc/internals.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/sh/intc/internals.h b/drivers/sh/intc/internals.h index 0cf8260971d4..df36a421e675 100644 --- a/drivers/sh/intc/internals.h +++ b/drivers/sh/intc/internals.h | |||
| @@ -53,7 +53,6 @@ struct intc_desc_int { | |||
| 53 | struct list_head list; | 53 | struct list_head list; |
| 54 | struct sys_device sysdev; | 54 | struct sys_device sysdev; |
| 55 | struct radix_tree_root tree; | 55 | struct radix_tree_root tree; |
| 56 | pm_message_t state; | ||
| 57 | raw_spinlock_t lock; | 56 | raw_spinlock_t lock; |
| 58 | unsigned int index; | 57 | unsigned int index; |
| 59 | unsigned long *reg; | 58 | unsigned long *reg; |