Changeset c2b2de7 in mainline for kernel/genarch/include/drivers/arm926_uart/arm926_uart.h

Timestamp:

2012-10-17T22:17:29Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

150a271

Parents:

6454ad47 (diff), 57912af3 (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 changes from bbxm branch

File:

• kernel/genarch/include/drivers/arm926_uart/arm926_uart.h (modified) (1 diff)

kernel/genarch/include/drivers/arm926_uart/arm926_uart.h

@@ -35 +35 @@
  */
 
-#ifndef KERN_S3C24XX_UART_H_
-#define KERN_S3C24XX_UART_H_
+#ifndef KERN_ARM926_UART_H_
+#define KERN_ARM926_UART_H_
 
 #include <ddi/irq.h>