diff options
| author | Alejandro Gonzalez <alex.gonzalez@digi.com> | 2010-05-25 17:42:29 +0200 |
|---|---|---|
| committer | Alejandro Gonzalez <alex.gonzalez@digi.com> | 2010-05-26 13:29:17 +0200 |
| commit | e749e37adf1735c5a0b3bc5262cb542995ce42e9 (patch) | |
| tree | 17c06371247666953fa01265485d9fd8a0642266 /drivers | |
| parent | ad3c88d1e262462a23d9692c6f7a7cd661f129b2 (diff) | |
ccwmx51: Fix compilation issues after applying Freescale patches
The mach-mx51 folder has been replaced by mach-mx5 to enable the addition
of more platforms.
Signed-off-by: Alejandro Gonzalez <alex.gonzalez@digi.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mtd/nand/mxc_nd2.h | 2 | ||||
| -rw-r--r-- | drivers/mxc/ipu3/ipu_disp.c | 2 | ||||
| -rw-r--r-- | drivers/net/wireless/ath6kl/os/linux/include/athendpack_linux.h | 0 | ||||
| -rw-r--r-- | drivers/net/wireless/ath6kl/os/linux/include/athstartpack_linux.h | 0 |
4 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mtd/nand/mxc_nd2.h b/drivers/mtd/nand/mxc_nd2.h index 16211706e9b9..ea128f6da41b 100644 --- a/drivers/mtd/nand/mxc_nd2.h +++ b/drivers/mtd/nand/mxc_nd2.h @@ -41,7 +41,7 @@ * For V3 NFC registers Definition */ /* AXI Bus Mapped */ -#define NFC_AXI_BASE_ADDR NFC_BASE_ADDR_AXI +#define NFC_AXI_BASE_ADDR MX51_NFC_BASE_ADDR_AXI #if defined(CONFIG_ARCH_MXC_HAS_NFC_V3_1) /* mx37 */ #define MXC_INT_NANDFC MXC_INT_EMI diff --git a/drivers/mxc/ipu3/ipu_disp.c b/drivers/mxc/ipu3/ipu_disp.c index b432cb9df734..00c5008d149f 100644 --- a/drivers/mxc/ipu3/ipu_disp.c +++ b/drivers/mxc/ipu3/ipu_disp.c @@ -954,7 +954,7 @@ int32_t ipu_init_sync_panel(int disp, uint32_t pixel_clk, if ((v_sync_width == 0) || (h_sync_width == 0)) return EINVAL; - adapt_panel_to_ipu_restricitions((uint16_t *)&pixel_clk, width, height, + adapt_panel_to_ipu_restricitions((uint32_t *)&pixel_clk, width, height, h_start_width, h_end_width, v_start_width, &v_end_width); h_total = width + h_sync_width + h_start_width + h_end_width; diff --git a/drivers/net/wireless/ath6kl/os/linux/include/athendpack_linux.h b/drivers/net/wireless/ath6kl/os/linux/include/athendpack_linux.h deleted file mode 100644 index e69de29bb2d1..000000000000 --- a/drivers/net/wireless/ath6kl/os/linux/include/athendpack_linux.h +++ /dev/null diff --git a/drivers/net/wireless/ath6kl/os/linux/include/athstartpack_linux.h b/drivers/net/wireless/ath6kl/os/linux/include/athstartpack_linux.h deleted file mode 100644 index e69de29bb2d1..000000000000 --- a/drivers/net/wireless/ath6kl/os/linux/include/athstartpack_linux.h +++ /dev/null |