android_kernel_xiaomi_sm7250/include
Sam Ravnborg 943d0e8613 sparc: Merge asm-sparc{,64}/termbits.h
The type of tcflag_t differs from 32 and 64 bit.
For 32 bit it is long
For 64 bit it is int

Altough these have same size then I was not sure that
it was OK to change the 64 bit version to long as this
is part of the ABI so it was made conditional.

:$ diff -u include/asm-sparc/termbits.h include/asm-sparc64/termbits.h
:-- include/asm-sparc/termbits.h	2008-06-13 06:42:07.000000000 +0200
:++ include/asm-sparc64/termbits.h	2008-06-13 06:42:07.000000000 +0200
:@@ -1,11 +1,11 @@
:-#ifndef _SPARC_TERMBITS_H
:-#define _SPARC_TERMBITS_H
:+#ifndef _SPARC64_TERMBITS_H
:+#define _SPARC64_TERMBITS_H
:
: #include <linux/posix_types.h>
:
: typedef unsigned char   cc_t;
: typedef unsigned int    speed_t;
:-typedef unsigned long   tcflag_t;
:+typedef unsigned int    tcflag_t;
:
: #define NCC 8
: struct termio {
:@@ -102,7 +102,7 @@
: #define IXANY	0x00000800
: #define IXOFF	0x00001000
: #define IMAXBEL	0x00002000
:-#define IUTF8   0x00004000
:+#define IUTF8	0x00004000
:
: /* c_oflag bits */
: #define OPOST	0x00000001
:@@ -171,7 +171,6 @@
: #define HUPCL	  0x00000400
: #define CLOCAL	  0x00000800
: #define CBAUDEX   0x00001000
:-/* We'll never see these speeds with the Zilogs, but for completeness... */
: #define  BOTHER   0x00001000
: #define  B57600   0x00001001
: #define  B115200  0x00001002
:@@ -199,7 +198,7 @@
: #define B3500000  0x00001012
: #define B4000000  0x00001013  */
: #define CIBAUD	  0x100f0000  /* input baud rate (not used) */
:-#define CMSPAR	  0x40000000  /* mark or space (stick) parity */
:+#define CMSPAR    0x40000000  /* mark or space (stick) parity */
: #define CRTSCTS	  0x80000000  /* flow control */
:
: #define IBSHIFT	  16		/* Shift from CBAUD to CIBAUD */
:@@ -258,4 +257,4 @@
: #define	TCSADRAIN	1
: #define	TCSAFLUSH	2
:
:-#endif /* !(_SPARC_TERMBITS_H) */
:+#endif /* !(_SPARC64_TERMBITS_H) */

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
2008-07-17 21:42:12 -07:00
..
acpi Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 2008-07-16 17:25:46 -07:00
asm-alpha
asm-arm Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc 2008-07-16 15:17:52 -07:00
asm-avr32 atmel-mci: Driver for Atmel on-chip MMC controllers 2008-07-15 14:14:49 +02:00
asm-blackfin
asm-cris
asm-frv frv: fix irqs_disabled() to return an int, not an unsigned long 2008-07-12 14:33:42 -07:00
asm-generic Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 2008-07-16 17:25:46 -07:00
asm-h8300
asm-ia64 ACPI : Create "idle=nomwait" bootparam 2008-07-16 23:27:05 +02:00
asm-m32r
asm-m68k
asm-m68knommu
asm-mips Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc 2008-07-16 15:17:52 -07:00
asm-mn10300
asm-parisc
asm-powerpc Merge commit 'origin/master' 2008-07-16 11:07:59 +10:00
asm-s390 [S390] qdio: new qdio driver. 2008-07-17 17:22:10 +02:00
asm-sh
asm-sparc sparc: Merge asm-sparc{,64}/termbits.h 2008-07-17 21:42:12 -07:00
asm-sparc64 sparc: Merge asm-sparc{,64}/termbits.h 2008-07-17 21:42:12 -07:00
asm-um
asm-v850
asm-x86 Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 2008-07-17 10:38:59 -07:00
asm-xtensa
crypto crypto: hash - Move ahash functions into crypto/hash.h 2008-07-10 20:35:18 +08:00
drm drm/radeon: fixup issue with radeon and PAT support. 2008-07-15 15:48:05 +10:00
keys
linux Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2 2008-07-17 10:55:51 -07:00
math-emu
media
mtd
net
pcmcia
rdma RDMA/addr: Keep pointer to netdevice in struct rdma_dev_addr 2008-07-14 23:48:53 -07:00
rxrpc
scsi Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 2008-07-15 18:58:04 -07:00
sound ALSA: Release v1.0.17 2008-07-14 09:54:43 +02:00
video
xen
Kbuild drm: reorganise drm tree to be more future proof. 2008-07-14 10:45:01 +10:00