summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cleopatre/Makefile5
-rw-r--r--cleopatre/linux-2.6.25.10-spc300/Makefile17
-rw-r--r--cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/.gitignore32
-rw-r--r--cleopatre/linux-2.6.25.10-spc300/scripts/Makefile.cpincludes20
-rwxr-xr-xcleopatre/linux-2.6.25.10-spc300/scripts/cpincludes11
-rw-r--r--common/include/asm/arch/ips/arizona.h (renamed from cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/ips/arizona.h)0
-rw-r--r--common/include/asm/arch/ips/gic.h (renamed from cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/ips/gic.h)0
-rw-r--r--common/include/asm/arch/ips/gpio.h (renamed from cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/ips/gpio.h)0
-rw-r--r--common/include/asm/arch/ips/hardware/arm_apb.h (renamed from cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/ips/hardware/arm_apb.h)0
-rw-r--r--common/include/asm/arch/ips/hardware/arm_gpio.h (renamed from cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/ips/hardware/arm_gpio.h)0
-rw-r--r--common/include/asm/arch/ips/hardware/arm_ictl.h (renamed from cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/ips/hardware/arm_ictl.h)0
-rw-r--r--common/include/asm/arch/ips/hardware/arm_timer1.h (renamed from cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/ips/hardware/arm_timer1.h)0
-rw-r--r--common/include/asm/arch/ips/hardware/arm_timer2.h (renamed from cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/ips/hardware/arm_timer2.h)0
-rw-r--r--common/include/asm/arch/ips/hardware/arm_uart1.h (renamed from cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/ips/hardware/arm_uart1.h)0
-rw-r--r--common/include/asm/arch/ips/hardware/arm_uart2.h (renamed from cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/ips/hardware/arm_uart2.h)0
-rw-r--r--common/include/asm/arch/ips/hardware/arm_wdt.h (renamed from cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/ips/hardware/arm_wdt.h)0
-rw-r--r--common/include/asm/arch/ips/hardware/boot_arm_hard.h (renamed from cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/ips/hardware/boot_arm_hard.h)0
-rw-r--r--common/include/asm/arch/ips/hardware/bus_sys.h (renamed from cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/ips/hardware/bus_sys.h)0
-rw-r--r--[-rwxr-xr-x]common/include/asm/arch/ips/hardware/ethernet_ctrl.h (renamed from cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/ips/hardware/ethernet_ctrl.h)0
-rw-r--r--common/include/asm/arch/ips/hardware/gpdma.h (renamed from cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/ips/hardware/gpdma.h)0
-rw-r--r--common/include/asm/arch/ips/hardware/i2s.h (renamed from cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/ips/hardware/i2s.h)0
-rw-r--r--common/include/asm/arch/ips/hardware/pcm.h (renamed from cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/ips/hardware/pcm.h)0
-rw-r--r--common/include/asm/arch/ips/hardware/pkg_maria_regbank.h (renamed from cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/ips/hardware/pkg_maria_regbank.h)0
-rw-r--r--common/include/asm/arch/ips/hardware/sdram.h (renamed from cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/ips/hardware/sdram.h)0
-rw-r--r--common/include/asm/arch/ips/hardware/spi.h (renamed from cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/ips/hardware/spi.h)0
-rw-r--r--common/include/asm/arch/ips/hardware/sys_apb.h (renamed from cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/ips/hardware/sys_apb.h)0
-rw-r--r--common/include/asm/arch/ips/ips_access.h (renamed from cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/ips/ips_access.h)0
-rw-r--r--common/include/asm/arch/ips/regbank.h (renamed from cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/ips/regbank.h)0
-rw-r--r--common/include/asm/arch/ips/spi.h (renamed from cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/ips/spi.h)0
-rw-r--r--common/include/asm/arch/ips/timer.h (renamed from cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/ips/timer.h)0
-rw-r--r--common/include/asm/arch/ips/uart.h (renamed from cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/ips/uart.h)0
-rw-r--r--common/include/asm/arch/ips/wdt.h (renamed from cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/ips/wdt.h)0
32 files changed, 81 insertions, 4 deletions
diff --git a/cleopatre/Makefile b/cleopatre/Makefile
index 9d9adae942..2dbed00699 100644
--- a/cleopatre/Makefile
+++ b/cleopatre/Makefile
@@ -129,6 +129,7 @@ bundle-standalone:
$(Q)mkdir -p $(BUNDLE_PLCBIN_PATH)
$(Q)[ "$(PLC_BINS)" = "" ] || $(MAKE) $(PLC_BINS)
$(Q)echo "Generate Bundle archive..."
+ $(Q)$(MAKE) prepare-includes
$(Q)find $(BUNDLE_PATH)/application/ -name Module -exec rm -f '{}' ';'
$(Q)sed -i -e 's/\(BUNDLE_VERSION *= *\)\(.*\)/\1$(BUNDLE_VERSION)/' $(BUILDROOT_PATH)/target/device/Spidcom/Makefile.in
$(Q)sed -i -e 's/\(EXTRAVERSION *= *\)\(.*\)/\1-$(BUNDLE_VERSION)/' $(BUNDLE_PATH)/u-boot-1.1.6/Makefile
@@ -147,6 +148,10 @@ bundle-clean-standalone:
$(Q)rm -rf $(WORK_DIRECTORY)
+prepare-includes:
+ $(Q)$(BUNDLE_PATH)/linux-$(LINUX_VERSION)-spc300/scripts/cpincludes $(BUNDLE_PATH)/linux-$(LINUX_VERSION)-spc300
+ $(Q)rm -f $(BUNDLE_PATH)/linux-$(LINUX_VERSION)-spc300/scripts/cpincludes
+ $(Q)rm -f $(BUNDLE_PATH)/linux-$(LINUX_VERSION)-spc300/include/asm-arm/arch-spc300/.gitignore
cesar-plc-debug:
$(Q)$(MAKE) -C $(CESAR_PRJ_PATH)/plc clean
diff --git a/cleopatre/linux-2.6.25.10-spc300/Makefile b/cleopatre/linux-2.6.25.10-spc300/Makefile
index fc4a394be4..f200a7945d 100644
--- a/cleopatre/linux-2.6.25.10-spc300/Makefile
+++ b/cleopatre/linux-2.6.25.10-spc300/Makefile
@@ -897,13 +897,19 @@ include/config/kernel.release: include/config/auto.conf FORCE
# version.h and scripts_basic is processed / created.
# Listed in dependency order
-PHONY += prepare archprepare prepare0 prepare1 prepare2 prepare3
+PHONY += prepare archprepare prepare0 prepare1 prepare2 prepare3 prepare4
+
+# prepare4 is used to copy include files from common/
+prepare4:
+ $(Q)if [ -f $(srctree)/scripts/cpincludes ]; then \
+ $(MAKE) -f $(srctree)/scripts/Makefile.cpincludes; \
+ fi;
# prepare3 is used to check if we are building in a separate output directory,
# and if so do:
# 1) Check that make has not been executed in the kernel src $(srctree)
# 2) Create the include2 directory, used for the second asm symlink
-prepare3: include/config/kernel.release
+prepare3: prepare4 include/config/kernel.release
ifneq ($(KBUILD_SRC),)
@echo ' Using $(srctree) as source for kernel'
$(Q)if [ -f $(srctree)/.config -o -d $(srctree)/include/config ]; then \
@@ -1279,7 +1285,7 @@ PHONY += $(module-dirs) modules
$(module-dirs): crmodverdir $(objtree)/Module.symvers
$(Q)$(MAKE) $(build)=$(patsubst _module_%,%,$@)
-modules: $(module-dirs)
+modules: prepare $(module-dirs)
@echo ' Building modules, stage 2.';
$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
@@ -1323,7 +1329,10 @@ help:
# Dummies...
PHONY += prepare scripts
-prepare: ;
+prepare:
+ @if [ -f $(srctree)/scripts/cpincludes ]; then \
+ $(MAKE) -f $(srctree)/scripts/Makefile.cpincludes; \
+ fi;
scripts: ;
endif # KBUILD_EXTMOD
diff --git a/cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/.gitignore b/cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/.gitignore
new file mode 100644
index 0000000000..4119d58772
--- /dev/null
+++ b/cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/.gitignore
@@ -0,0 +1,32 @@
+ips/arizona.h
+ips/gic.h
+ips/gpio.h
+ips/ips_access.h
+ips/regbank.h
+ips/spi.h
+ips/timer.h
+ips/uart.h
+ips/wdt.h
+
+ips/hardware/arm_apb.h
+ips/hardware/arm_gpio.h
+ips/hardware/arm_ictl.h
+ips/hardware/arm_timer1.h
+ips/hardware/arm_timer2.h
+ips/hardware/arm_uart1.h
+ips/hardware/arm_uart2.h
+ips/hardware/arm_wdt.h
+ips/hardware/boot_arm_hard.h
+ips/hardware/bus_sys.h
+ips/hardware/dsp.h
+ips/hardware/ethernet_ctrl.h
+ips/hardware/gpdma.h
+ips/hardware/i2s.h
+ips/hardware/miu.h
+ips/hardware/mpeg_ts.h
+ips/hardware/pcm.h
+ips/hardware/pkg_maria_regbank.h
+ips/hardware/sdram.h
+ips/hardware/spi.h
+ips/hardware/sys_apb.h
+
diff --git a/cleopatre/linux-2.6.25.10-spc300/scripts/Makefile.cpincludes b/cleopatre/linux-2.6.25.10-spc300/scripts/Makefile.cpincludes
new file mode 100644
index 0000000000..2f099ee619
--- /dev/null
+++ b/cleopatre/linux-2.6.25.10-spc300/scripts/Makefile.cpincludes
@@ -0,0 +1,20 @@
+# ==========================================================================
+# Copy includes from common/include
+# ==========================================================================
+
+include scripts/Kbuild.include
+
+quiet_cmd_cpincludes = CALL $<
+ cmd_cpincludes = $(CONFIG_SHELL) $< $(srctree)
+
+PHONY += cpincludes
+cpincludes: scripts/cpincludes FORCE
+ $(call cmd,cpincludes)
+
+PHONY += FORCE
+FORCE:
+
+# Declare the contents of the .PHONY variable as phony. We keep that
+# information in a variable se we can use it in if_changed and friends.
+
+.PHONY: $(PHONY)
diff --git a/cleopatre/linux-2.6.25.10-spc300/scripts/cpincludes b/cleopatre/linux-2.6.25.10-spc300/scripts/cpincludes
new file mode 100755
index 0000000000..c84bb11a8b
--- /dev/null
+++ b/cleopatre/linux-2.6.25.10-spc300/scripts/cpincludes
@@ -0,0 +1,11 @@
+#!/bin/sh
+# Copy includes from common/include
+
+# Usage
+# $1 - Kernel src directory
+
+LINUX_INC=$1/include/asm-arm/arch-spc300
+COMMON_INC=$1/../../common/include/asm/arch
+
+rm -rf $LINUX_INC/ips
+cp -r $COMMON_INC/ips $LINUX_INC
diff --git a/cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/ips/arizona.h b/common/include/asm/arch/ips/arizona.h
index b6e351cb82..b6e351cb82 100644
--- a/cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/ips/arizona.h
+++ b/common/include/asm/arch/ips/arizona.h
diff --git a/cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/ips/gic.h b/common/include/asm/arch/ips/gic.h
index ed7474980d..ed7474980d 100644
--- a/cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/ips/gic.h
+++ b/common/include/asm/arch/ips/gic.h
diff --git a/cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/ips/gpio.h b/common/include/asm/arch/ips/gpio.h
index d821e8b9e5..d821e8b9e5 100644
--- a/cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/ips/gpio.h
+++ b/common/include/asm/arch/ips/gpio.h
diff --git a/cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/ips/hardware/arm_apb.h b/common/include/asm/arch/ips/hardware/arm_apb.h
index 7b23e6c5e6..7b23e6c5e6 100644
--- a/cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/ips/hardware/arm_apb.h
+++ b/common/include/asm/arch/ips/hardware/arm_apb.h
diff --git a/cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/ips/hardware/arm_gpio.h b/common/include/asm/arch/ips/hardware/arm_gpio.h
index c80f1bb368..c80f1bb368 100644
--- a/cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/ips/hardware/arm_gpio.h
+++ b/common/include/asm/arch/ips/hardware/arm_gpio.h
diff --git a/cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/ips/hardware/arm_ictl.h b/common/include/asm/arch/ips/hardware/arm_ictl.h
index 3796c6ba97..3796c6ba97 100644
--- a/cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/ips/hardware/arm_ictl.h
+++ b/common/include/asm/arch/ips/hardware/arm_ictl.h
diff --git a/cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/ips/hardware/arm_timer1.h b/common/include/asm/arch/ips/hardware/arm_timer1.h
index 59ade79bc0..59ade79bc0 100644
--- a/cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/ips/hardware/arm_timer1.h
+++ b/common/include/asm/arch/ips/hardware/arm_timer1.h
diff --git a/cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/ips/hardware/arm_timer2.h b/common/include/asm/arch/ips/hardware/arm_timer2.h
index 84e23c0fcd..84e23c0fcd 100644
--- a/cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/ips/hardware/arm_timer2.h
+++ b/common/include/asm/arch/ips/hardware/arm_timer2.h
diff --git a/cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/ips/hardware/arm_uart1.h b/common/include/asm/arch/ips/hardware/arm_uart1.h
index e1d223005a..e1d223005a 100644
--- a/cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/ips/hardware/arm_uart1.h
+++ b/common/include/asm/arch/ips/hardware/arm_uart1.h
diff --git a/cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/ips/hardware/arm_uart2.h b/common/include/asm/arch/ips/hardware/arm_uart2.h
index e581f8b12b..e581f8b12b 100644
--- a/cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/ips/hardware/arm_uart2.h
+++ b/common/include/asm/arch/ips/hardware/arm_uart2.h
diff --git a/cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/ips/hardware/arm_wdt.h b/common/include/asm/arch/ips/hardware/arm_wdt.h
index 59ef837730..59ef837730 100644
--- a/cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/ips/hardware/arm_wdt.h
+++ b/common/include/asm/arch/ips/hardware/arm_wdt.h
diff --git a/cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/ips/hardware/boot_arm_hard.h b/common/include/asm/arch/ips/hardware/boot_arm_hard.h
index 28a3c906bc..28a3c906bc 100644
--- a/cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/ips/hardware/boot_arm_hard.h
+++ b/common/include/asm/arch/ips/hardware/boot_arm_hard.h
diff --git a/cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/ips/hardware/bus_sys.h b/common/include/asm/arch/ips/hardware/bus_sys.h
index 8484aa0b96..8484aa0b96 100644
--- a/cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/ips/hardware/bus_sys.h
+++ b/common/include/asm/arch/ips/hardware/bus_sys.h
diff --git a/cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/ips/hardware/ethernet_ctrl.h b/common/include/asm/arch/ips/hardware/ethernet_ctrl.h
index 88389cd888..88389cd888 100755..100644
--- a/cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/ips/hardware/ethernet_ctrl.h
+++ b/common/include/asm/arch/ips/hardware/ethernet_ctrl.h
diff --git a/cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/ips/hardware/gpdma.h b/common/include/asm/arch/ips/hardware/gpdma.h
index 7c5ab26a6e..7c5ab26a6e 100644
--- a/cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/ips/hardware/gpdma.h
+++ b/common/include/asm/arch/ips/hardware/gpdma.h
diff --git a/cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/ips/hardware/i2s.h b/common/include/asm/arch/ips/hardware/i2s.h
index 353062f37c..353062f37c 100644
--- a/cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/ips/hardware/i2s.h
+++ b/common/include/asm/arch/ips/hardware/i2s.h
diff --git a/cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/ips/hardware/pcm.h b/common/include/asm/arch/ips/hardware/pcm.h
index 3fd15b3642..3fd15b3642 100644
--- a/cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/ips/hardware/pcm.h
+++ b/common/include/asm/arch/ips/hardware/pcm.h
diff --git a/cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/ips/hardware/pkg_maria_regbank.h b/common/include/asm/arch/ips/hardware/pkg_maria_regbank.h
index e9420764b1..e9420764b1 100644
--- a/cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/ips/hardware/pkg_maria_regbank.h
+++ b/common/include/asm/arch/ips/hardware/pkg_maria_regbank.h
diff --git a/cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/ips/hardware/sdram.h b/common/include/asm/arch/ips/hardware/sdram.h
index ed25de04b4..ed25de04b4 100644
--- a/cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/ips/hardware/sdram.h
+++ b/common/include/asm/arch/ips/hardware/sdram.h
diff --git a/cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/ips/hardware/spi.h b/common/include/asm/arch/ips/hardware/spi.h
index 4838209baf..4838209baf 100644
--- a/cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/ips/hardware/spi.h
+++ b/common/include/asm/arch/ips/hardware/spi.h
diff --git a/cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/ips/hardware/sys_apb.h b/common/include/asm/arch/ips/hardware/sys_apb.h
index b463299df2..b463299df2 100644
--- a/cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/ips/hardware/sys_apb.h
+++ b/common/include/asm/arch/ips/hardware/sys_apb.h
diff --git a/cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/ips/ips_access.h b/common/include/asm/arch/ips/ips_access.h
index 93ca010b86..93ca010b86 100644
--- a/cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/ips/ips_access.h
+++ b/common/include/asm/arch/ips/ips_access.h
diff --git a/cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/ips/regbank.h b/common/include/asm/arch/ips/regbank.h
index ac3f26361c..ac3f26361c 100644
--- a/cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/ips/regbank.h
+++ b/common/include/asm/arch/ips/regbank.h
diff --git a/cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/ips/spi.h b/common/include/asm/arch/ips/spi.h
index df03cac0f6..df03cac0f6 100644
--- a/cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/ips/spi.h
+++ b/common/include/asm/arch/ips/spi.h
diff --git a/cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/ips/timer.h b/common/include/asm/arch/ips/timer.h
index 7dc49aa0ca..7dc49aa0ca 100644
--- a/cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/ips/timer.h
+++ b/common/include/asm/arch/ips/timer.h
diff --git a/cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/ips/uart.h b/common/include/asm/arch/ips/uart.h
index 58fc001a0b..58fc001a0b 100644
--- a/cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/ips/uart.h
+++ b/common/include/asm/arch/ips/uart.h
diff --git a/cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/ips/wdt.h b/common/include/asm/arch/ips/wdt.h
index 6e4c1c1bfc..6e4c1c1bfc 100644
--- a/cleopatre/linux-2.6.25.10-spc300/include/asm-arm/arch-spc300/ips/wdt.h
+++ b/common/include/asm/arch/ips/wdt.h