Changeset b0b4592e in mainline for kernel/genarch/src/drivers/s3c24xx

Timestamp:

2014-03-15T19:21:53Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

c773adc

Parents:

2034f98 (diff), 8cffdf5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

Location:

kernel/genarch/src/drivers/s3c24xx

Files:

• irqc.c (moved) (moved from kernel/genarch/src/drivers/s3c24xx_irqc/s3c24xx_irqc.c ) (1 diff)
• uart.c (moved) (moved from kernel/genarch/src/drivers/s3c24xx_uart/s3c24xx_uart.c ) (1 diff)

kernel/genarch/src/drivers/s3c24xx/irqc.c

@@ -37 +37 @@
  */
 
-#include <genarch/drivers/s3c24xx_irqc/s3c24xx_irqc.h>
+#include <genarch/drivers/s3c24xx/irqc.h>
 #include <arch/asm.h>
 

kernel/genarch/src/drivers/s3c24xx/uart.c

@@ -38 +38 @@
  */
 
-#include <genarch/drivers/s3c24xx_uart/s3c24xx_uart.h>
+#include <genarch/drivers/s3c24xx/uart.h>
 #include <console/chardev.h>
 #include <console/console.h>