diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-16 16:48:45 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-16 16:48:45 -0700 |
| commit | 9c0d2a20fe331946c1a65a5865faf56e93255c5c (patch) | |
| tree | 9d47a9239b6249a5dd4244195ec4cc1e55fda3cd /arch/arm/mach-loki/common.c | |
| parent | 5e6b83ed8c00f2e2ae5b2413c5907bed735b600d (diff) | |
| parent | 66bfa2f03191aec2e2958414b1dfb80a56637133 (diff) | |
| download | kernel_goldelico_gta04-9c0d2a20fe331946c1a65a5865faf56e93255c5c.zip kernel_goldelico_gta04-9c0d2a20fe331946c1a65a5865faf56e93255c5c.tar.gz kernel_goldelico_gta04-9c0d2a20fe331946c1a65a5865faf56e93255c5c.tar.bz2 | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm: (38 commits)
[ARM] 5191/1: ARM: remove CVS keywords
[ARM] pxafb: fix the warning of incorrect lccr when lcd_conn is specified
[ARM] pxafb: add flag to specify output format on LDD pins when base is RGBT16
[ARM] pxafb: fix the incorrect configuration of GPIO77 as ACBIAS for TFT LCD
[ARM] 5198/1: PalmTX: PCMCIA fixes
[ARM] Fix a pile of broken watchdog drivers
[ARM] update mach-types
[ARM] 5196/1: fix inline asm constraints for preload
[ARM] 5194/1: update .gitignore
[ARM] add proc-macros.S include to proc-arm940 and proc-arm946
[ARM] 5192/1: ARM TLB: add v7wbi_{possible,always}_flags to {possible,always}_tlb_flags
[ARM] 5193/1: Wire up missing syscalls
[ARM] traps: don't call undef hook functions with spinlock held
[ARM] 5183/2: Provide Poodle LoCoMo GPIO names
[ARM] dma-mapping: provide sync_range APIs
[ARM] dma-mapping: improve type-safeness of DMA translations
[ARM] Kirkwood: instantiate the orion_spi driver in the platform code
[ARM] prevent crashing when too much RAM installed
[ARM] Kirkwood: Instantiate mv_xor driver
[ARM] Orion: Instantiate mv_xor driver for 5182
...
Diffstat (limited to 'arch/arm/mach-loki/common.c')
| -rw-r--r-- | arch/arm/mach-loki/common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-loki/common.c b/arch/arm/mach-loki/common.c index e20cdbc..c0d2d9d 100644 --- a/arch/arm/mach-loki/common.c +++ b/arch/arm/mach-loki/common.c @@ -19,8 +19,8 @@ #include <asm/mach/map.h> #include <asm/mach/time.h> #include <mach/loki.h> -#include <asm/plat-orion/orion_nand.h> -#include <asm/plat-orion/time.h> +#include <plat/orion_nand.h> +#include <plat/time.h> #include "common.h" /***************************************************************************** |