aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/hid-debug.h7
-rw-r--r--include/linux/libata.h1
-rw-r--r--include/linux/mmc/mmc.h2
-rw-r--r--include/linux/videodev2.h9
4 files changed, 15 insertions, 4 deletions
diff --git a/include/linux/hid-debug.h b/include/linux/hid-debug.h
index f04d6d75c09..8e4dbb51fc7 100644
--- a/include/linux/hid-debug.h
+++ b/include/linux/hid-debug.h
@@ -700,9 +700,10 @@ static char *keys[KEY_MAX + 1] = {
700 700
701static char *relatives[REL_MAX + 1] = { 701static char *relatives[REL_MAX + 1] = {
702 [REL_X] = "X", [REL_Y] = "Y", 702 [REL_X] = "X", [REL_Y] = "Y",
703 [REL_Z] = "Z", [REL_HWHEEL] = "HWheel", 703 [REL_Z] = "Z", [REL_RX] = "Rx",
704 [REL_DIAL] = "Dial", [REL_WHEEL] = "Wheel", 704 [REL_RY] = "Ry", [REL_RZ] = "Rz",
705 [REL_MISC] = "Misc", 705 [REL_HWHEEL] = "HWheel", [REL_DIAL] = "Dial",
706 [REL_WHEEL] = "Wheel", [REL_MISC] = "Misc",
706}; 707};
707 708
708static char *absolutes[ABS_MAX + 1] = { 709static char *absolutes[ABS_MAX + 1] = {
diff --git a/include/linux/libata.h b/include/linux/libata.h
index ab275483032..e53a13ba7f7 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -1143,6 +1143,7 @@ static inline void ata_tf_init(struct ata_device *dev, struct ata_taskfile *tf)
1143 1143
1144static inline void ata_qc_reinit(struct ata_queued_cmd *qc) 1144static inline void ata_qc_reinit(struct ata_queued_cmd *qc)
1145{ 1145{
1146 qc->dma_dir = DMA_NONE;
1146 qc->__sg = NULL; 1147 qc->__sg = NULL;
1147 qc->flags = 0; 1148 qc->flags = 0;
1148 qc->cursect = qc->cursg = qc->cursg_ofs = 0; 1149 qc->cursect = qc->cursg = qc->cursg_ofs = 0;
diff --git a/include/linux/mmc/mmc.h b/include/linux/mmc/mmc.h
index a3594dfd696..bcf24909d67 100644
--- a/include/linux/mmc/mmc.h
+++ b/include/linux/mmc/mmc.h
@@ -42,7 +42,7 @@ struct mmc_command {
42#define MMC_RSP_R1B (MMC_RSP_PRESENT|MMC_RSP_CRC|MMC_RSP_OPCODE|MMC_RSP_BUSY) 42#define MMC_RSP_R1B (MMC_RSP_PRESENT|MMC_RSP_CRC|MMC_RSP_OPCODE|MMC_RSP_BUSY)
43#define MMC_RSP_R2 (MMC_RSP_PRESENT|MMC_RSP_136|MMC_RSP_CRC) 43#define MMC_RSP_R2 (MMC_RSP_PRESENT|MMC_RSP_136|MMC_RSP_CRC)
44#define MMC_RSP_R3 (MMC_RSP_PRESENT) 44#define MMC_RSP_R3 (MMC_RSP_PRESENT)
45#define MMC_RSP_R6 (MMC_RSP_PRESENT|MMC_RSP_CRC) 45#define MMC_RSP_R6 (MMC_RSP_PRESENT|MMC_RSP_CRC|MMC_RSP_OPCODE)
46 46
47#define mmc_resp_type(cmd) ((cmd)->flags & (MMC_RSP_PRESENT|MMC_RSP_136|MMC_RSP_CRC|MMC_RSP_BUSY|MMC_RSP_OPCODE)) 47#define mmc_resp_type(cmd) ((cmd)->flags & (MMC_RSP_PRESENT|MMC_RSP_136|MMC_RSP_CRC|MMC_RSP_BUSY|MMC_RSP_OPCODE))
48 48
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h
index 5cb380a559f..d94e2683be5 100644
--- a/include/linux/videodev2.h
+++ b/include/linux/videodev2.h
@@ -662,6 +662,15 @@ typedef __u64 v4l2_std_id;
662#define V4L2_STD_ATSC_8_VSB ((v4l2_std_id)0x01000000) 662#define V4L2_STD_ATSC_8_VSB ((v4l2_std_id)0x01000000)
663#define V4L2_STD_ATSC_16_VSB ((v4l2_std_id)0x02000000) 663#define V4L2_STD_ATSC_16_VSB ((v4l2_std_id)0x02000000)
664 664
665/* FIXME:
666 Although std_id is 64 bits, there is an issue on PPC32 architecture that
667 makes switch(__u64) to break. So, there's a hack on v4l2-common.c rounding
668 this value to 32 bits.
669 As, currently, the max value is for V4L2_STD_ATSC_16_VSB (30 bits wide),
670 it should work fine. However, if needed to add more than two standards,
671 v4l2-common.c should be fixed.
672 */
673
665/* some merged standards */ 674/* some merged standards */
666#define V4L2_STD_MN (V4L2_STD_PAL_M|V4L2_STD_PAL_N|V4L2_STD_PAL_Nc|V4L2_STD_NTSC) 675#define V4L2_STD_MN (V4L2_STD_PAL_M|V4L2_STD_PAL_N|V4L2_STD_PAL_Nc|V4L2_STD_NTSC)
667#define V4L2_STD_B (V4L2_STD_PAL_B|V4L2_STD_PAL_B1|V4L2_STD_SECAM_B) 676#define V4L2_STD_B (V4L2_STD_PAL_B|V4L2_STD_PAL_B1|V4L2_STD_SECAM_B)