diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-05-19 05:04:03 -0400 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-19 05:04:03 -0400 |
| commit | 359542b2a1d8a945c135c2c4ea4434ce69fc2723 (patch) | |
| tree | 4dc5b1dfc14d9ae73043728749007750e53a92eb /arch/arm/mach-s5p6442 | |
| parent | bc3b67b8e965c1b499d604b7ec7d2e6090570c13 (diff) | |
| parent | ea5f50706385b61c1c0d24271bbe7c6e93129fbc (diff) | |
ARM: Merge for-2635/s5p-general
Merge branch 'for-2635/s5p-general' into for-linus/samsung2
Diffstat (limited to 'arch/arm/mach-s5p6442')
| -rw-r--r-- | arch/arm/mach-s5p6442/cpu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s5p6442/cpu.c b/arch/arm/mach-s5p6442/cpu.c index bc2524df89b3..a48fb553fd01 100644 --- a/arch/arm/mach-s5p6442/cpu.c +++ b/arch/arm/mach-s5p6442/cpu.c | |||
| @@ -95,7 +95,7 @@ void __init s5p6442_init_irq(void) | |||
| 95 | s5p_init_irq(vic, ARRAY_SIZE(vic)); | 95 | s5p_init_irq(vic, ARRAY_SIZE(vic)); |
| 96 | } | 96 | } |
| 97 | 97 | ||
| 98 | static struct sysdev_class s5p6442_sysclass = { | 98 | struct sysdev_class s5p6442_sysclass = { |
| 99 | .name = "s5p6442-core", | 99 | .name = "s5p6442-core", |
| 100 | }; | 100 | }; |
| 101 | 101 | ||