diff options
| author | Anton Vorontsov <cbouatmailru@gmail.com> | 2008-07-29 18:05:23 -0400 |
|---|---|---|
| committer | Anton Vorontsov <cbouatmailru@gmail.com> | 2008-07-29 18:05:23 -0400 |
| commit | 9fec6060d9e48ed7db0dac0e16d0f0f0e615b7f6 (patch) | |
| tree | 74b41f31a08f6500ff3dfcf64ba21e2d9a8e87e5 /include/asm-arm/arch-omap/hardware.h | |
| parent | fece418418f51e92dd7e67e17c5e3fe5a28d3279 (diff) | |
| parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) | |
Merge branch 'master' of /home/cbou/linux-2.6
Conflicts:
drivers/power/Kconfig
drivers/power/Makefile
Diffstat (limited to 'include/asm-arm/arch-omap/hardware.h')
| -rw-r--r-- | include/asm-arm/arch-omap/hardware.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-arm/arch-omap/hardware.h b/include/asm-arm/arch-omap/hardware.h index da572092e255..45fdfccbd5d4 100644 --- a/include/asm-arm/arch-omap/hardware.h +++ b/include/asm-arm/arch-omap/hardware.h | |||
| @@ -41,7 +41,6 @@ | |||
| 41 | #include <asm/types.h> | 41 | #include <asm/types.h> |
| 42 | #include <asm/arch/cpu.h> | 42 | #include <asm/arch/cpu.h> |
| 43 | #endif | 43 | #endif |
| 44 | #include <asm/arch/io.h> | ||
| 45 | #include <asm/arch/serial.h> | 44 | #include <asm/arch/serial.h> |
| 46 | 45 | ||
| 47 | /* | 46 | /* |
| @@ -285,6 +284,7 @@ | |||
| 285 | #include "omap1510.h" | 284 | #include "omap1510.h" |
| 286 | #include "omap24xx.h" | 285 | #include "omap24xx.h" |
| 287 | #include "omap16xx.h" | 286 | #include "omap16xx.h" |
| 287 | #include "omap34xx.h" | ||
| 288 | 288 | ||
| 289 | #ifndef __ASSEMBLER__ | 289 | #ifndef __ASSEMBLER__ |
| 290 | 290 | ||