diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-18 16:50:34 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-18 16:50:34 -0400 |
commit | a208f37a465e222218974ab20a31b42b7b4893b2 (patch) | |
tree | 77c6acdd4be32024330a14f2618b814126ce7a20 /arch/avr32/mach-at32ap/pio.h | |
parent | 511d9d34183662aada3890883e860b151d707e22 (diff) | |
parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) |
Merge branch 'linus' into x86/x2apic
Diffstat (limited to 'arch/avr32/mach-at32ap/pio.h')
-rw-r--r-- | arch/avr32/mach-at32ap/pio.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/avr32/mach-at32ap/pio.h b/arch/avr32/mach-at32ap/pio.h index 7795116a483a..9484dfcc08f2 100644 --- a/arch/avr32/mach-at32ap/pio.h +++ b/arch/avr32/mach-at32ap/pio.h | |||
@@ -57,7 +57,7 @@ | |||
57 | 57 | ||
58 | /* Bitfields in IFDR */ | 58 | /* Bitfields in IFDR */ |
59 | 59 | ||
60 | /* Bitfields in ISFR */ | 60 | /* Bitfields in IFSR */ |
61 | 61 | ||
62 | /* Bitfields in SODR */ | 62 | /* Bitfields in SODR */ |
63 | 63 | ||