diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-04 02:15:25 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-04 02:15:25 +0400 |
| commit | 4e76c5ccd5ac9bd003467d3bb0f49b18572dd4cd (patch) | |
| tree | 1c1b58b1964fec04ae7f830b53a47f1693993135 /arch/xtensa/platforms/xt2000 | |
| parent | b983471794e568fd71fa767da77a62ba517c3e63 (diff) | |
| parent | 65127d28e312bb6b38ce84a7bb71d762ef63ad4c (diff) | |
| download | linux-4e76c5ccd5ac9bd003467d3bb0f49b18572dd4cd.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6: (21 commits)
xtensa: we don't need to include asm/io.h
xtensa: only build platform or variant if they contain a Makefile
xtensa: make startup code discardable
xtensa: ccount clocksource
xtensa: remove platform rtc hooks
xtensa: use generic sched_clock()
xtensa: platform: s6105
xtensa: let platform override KERNELOFFSET
xtensa: s6000 variant
xtensa: s6000 variant core definitions
xtensa: variant irq set callbacks
xtensa: variant-specific code
xtensa: nommu support
xtensa: add flat support
xtensa: enforce slab alignment to maximum register width
xtensa: cope with ram beginning at higher addresses
xtensa: don't make bootmem bitmap larger than required
xtensa: fix init_bootmem_node() argument order
xtensa: use correct stack pointer for stack traces
xtensa: beat Kconfig into shape
...
Diffstat (limited to 'arch/xtensa/platforms/xt2000')
| -rw-r--r-- | arch/xtensa/platforms/xt2000/include/platform/hardware.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/xtensa/platforms/xt2000/include/platform/hardware.h b/arch/xtensa/platforms/xt2000/include/platform/hardware.h index 41459ad07766..886ef156ded3 100644 --- a/arch/xtensa/platforms/xt2000/include/platform/hardware.h +++ b/arch/xtensa/platforms/xt2000/include/platform/hardware.h @@ -16,7 +16,6 @@ #define _XTENSA_XT2000_HARDWARE_H #include <variant/core.h> -#include <asm/io.h> /* * Memory configuration. |