diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-arm/arch-aaec2000/aaec2000.h | 4 | ||||
-rw-r--r-- | include/linux/cdrom.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-arm/arch-aaec2000/aaec2000.h b/include/asm-arm/arch-aaec2000/aaec2000.h index 002227924b9f..a6d1ee0980f2 100644 --- a/include/asm-arm/arch-aaec2000/aaec2000.h +++ b/include/asm-arm/arch-aaec2000/aaec2000.h | |||
@@ -140,11 +140,11 @@ | |||
140 | #define TIMER3_CLEAR __REG(0x80000e0c) /* Timer 3 Clear Register */ | 140 | #define TIMER3_CLEAR __REG(0x80000e0c) /* Timer 3 Clear Register */ |
141 | 141 | ||
142 | /* Timer Control register bits */ | 142 | /* Timer Control register bits */ |
143 | #define TIMER_CTRL_ENABLE (1 << 7) /* Enable (Start° Timer */ | 143 | #define TIMER_CTRL_ENABLE (1 << 7) /* Enable (Start Timer) */ |
144 | #define TIMER_CTRL_PERIODIC (1 << 6) /* Periodic Running Mode */ | 144 | #define TIMER_CTRL_PERIODIC (1 << 6) /* Periodic Running Mode */ |
145 | #define TIMER_CTRL_FREE_RUNNING (0 << 6) /* Normal Running Mode */ | 145 | #define TIMER_CTRL_FREE_RUNNING (0 << 6) /* Normal Running Mode */ |
146 | #define TIMER_CTRL_CLKSEL_508K (1 << 3) /* 508KHz Clock select (Timer 1, 2) */ | 146 | #define TIMER_CTRL_CLKSEL_508K (1 << 3) /* 508KHz Clock select (Timer 1, 2) */ |
147 | #define TIMER_CTRL_CLKSEL_2K (0 << 3) /* 2KHz Clock Select (Timer 1, 2)*/ | 147 | #define TIMER_CTRL_CLKSEL_2K (0 << 3) /* 2KHz Clock Select (Timer 1, 2) */ |
148 | 148 | ||
149 | /* Power and State Control */ | 149 | /* Power and State Control */ |
150 | #define POWER_BASE __REG(0x80000400) | 150 | #define POWER_BASE __REG(0x80000400) |
diff --git a/include/linux/cdrom.h b/include/linux/cdrom.h index 2b641b176e7f..b6e4b52350aa 100644 --- a/include/linux/cdrom.h +++ b/include/linux/cdrom.h | |||
@@ -2,7 +2,7 @@ | |||
2 | * -- <linux/cdrom.h> | 2 | * -- <linux/cdrom.h> |
3 | * General header file for linux CD-ROM drivers | 3 | * General header file for linux CD-ROM drivers |
4 | * Copyright (C) 1992 David Giller, rafetmad@oxy.edu | 4 | * Copyright (C) 1992 David Giller, rafetmad@oxy.edu |
5 | * 1994, 1995 Eberhard Moenkeberg, emoenke@gwdg.de | 5 | * 1994, 1995 Eberhard Mönkeberg, emoenke@gwdg.de |
6 | * 1996 David van Leeuwen, david@tm.tno.nl | 6 | * 1996 David van Leeuwen, david@tm.tno.nl |
7 | * 1997, 1998 Erik Andersen, andersee@debian.org | 7 | * 1997, 1998 Erik Andersen, andersee@debian.org |
8 | * 1998-2002 Jens Axboe, axboe@suse.de | 8 | * 1998-2002 Jens Axboe, axboe@suse.de |