diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /arch/arm/mach-bcmring/include/csp/reg.h | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'arch/arm/mach-bcmring/include/csp/reg.h')
| -rw-r--r-- | arch/arm/mach-bcmring/include/csp/reg.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-bcmring/include/csp/reg.h b/arch/arm/mach-bcmring/include/csp/reg.h index e5f60bf5a1f3..56654d23c3d7 100644 --- a/arch/arm/mach-bcmring/include/csp/reg.h +++ b/arch/arm/mach-bcmring/include/csp/reg.h | |||
| @@ -16,7 +16,7 @@ | |||
| 16 | /** | 16 | /** |
| 17 | * @file reg.h | 17 | * @file reg.h |
| 18 | * | 18 | * |
| 19 | * @brief Generic register defintions used in CSP | 19 | * @brief Generic register definitions used in CSP |
| 20 | */ | 20 | */ |
| 21 | /****************************************************************************/ | 21 | /****************************************************************************/ |
| 22 | 22 | ||