summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/dvb/frontend.h4
-rw-r--r--include/linux/filter.h2
-rw-r--r--include/linux/hdreg.h3
-rw-r--r--include/linux/i2o.h2
-rw-r--r--include/linux/libata.h1
-rw-r--r--include/linux/netfilter_ipv4/ip_conntrack_tcp.h2
-rw-r--r--include/linux/pci_ids.h2
-rw-r--r--include/linux/socket.h4
-rw-r--r--include/linux/types.h2
-rw-r--r--include/linux/usb_sl811.h26
-rw-r--r--include/linux/wait.h12
11 files changed, 49 insertions, 11 deletions
diff --git a/include/linux/dvb/frontend.h b/include/linux/dvb/frontend.h
index d0300dcff0af..fd0bc530dda8 100644
--- a/include/linux/dvb/frontend.h
+++ b/include/linux/dvb/frontend.h
@@ -62,7 +62,7 @@ typedef enum fe_caps {
FE_CAN_HIERARCHY_AUTO = 0x100000,
FE_CAN_8VSB = 0x200000,
FE_CAN_16VSB = 0x400000,
- FE_NEEDS_BENDING = 0x20000000, // frontend requires frequency bending
+ FE_NEEDS_BENDING = 0x20000000, // not supported anymore, don't use (frontend requires frequency bending)
FE_CAN_RECOVER = 0x40000000, // frontend can recover from a cable unplug automatically
FE_CAN_MUTE_TS = 0x80000000 // frontend can stop spurious TS data output
} fe_caps_t;
@@ -78,7 +78,7 @@ struct dvb_frontend_info {
__u32 symbol_rate_min;
__u32 symbol_rate_max;
__u32 symbol_rate_tolerance; /* ppm */
- __u32 notifier_delay; /* ms */
+ __u32 notifier_delay; /* DEPRECATED */
fe_caps_t caps;
};
diff --git a/include/linux/filter.h b/include/linux/filter.h
index 17218abef8f1..3ba843c46382 100644
--- a/include/linux/filter.h
+++ b/include/linux/filter.h
@@ -8,7 +8,9 @@
#include <linux/compiler.h>
#include <linux/types.h>
+#ifdef __KERNEL__
#include <asm/atomic.h>
+#endif
/*
* Current version of the filter code architecture.
diff --git a/include/linux/hdreg.h b/include/linux/hdreg.h
index c94de12a5ee1..b5d660089de4 100644
--- a/include/linux/hdreg.h
+++ b/include/linux/hdreg.h
@@ -1,6 +1,7 @@
#ifndef _LINUX_HDREG_H
#define _LINUX_HDREG_H
+#ifdef __KERNEL__
#include <linux/ata.h>
/*
@@ -57,7 +58,7 @@
#define IO 0x02
#define REL 0x04
#define TAG_MASK 0xf8
-
+#endif /* __KERNEL__ */
/*
* Command Header sizes for IOCTL commands
diff --git a/include/linux/i2o.h b/include/linux/i2o.h
index 777a80f9f4a3..229bb91364ad 100644
--- a/include/linux/i2o.h
+++ b/include/linux/i2o.h
@@ -976,7 +976,7 @@ extern void i2o_debug_state(struct i2o_controller *c);
#define I2O_TIMEOUT_MESSAGE_GET 5
#define I2O_TIMEOUT_RESET 30
#define I2O_TIMEOUT_STATUS_GET 5
-#define I2O_TIMEOUT_LCT_GET 20
+#define I2O_TIMEOUT_LCT_GET 360
#define I2O_TIMEOUT_SCSI_SCB_ABORT 240
/* retries */
diff --git a/include/linux/libata.h b/include/linux/libata.h
index 605e0a728c0e..95a7b0ddb096 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -112,6 +112,7 @@ enum {
ATA_FLAG_SRST = (1 << 5), /* use ATA SRST, not E.D.D. */
ATA_FLAG_MMIO = (1 << 6), /* use MMIO, not PIO */
ATA_FLAG_SATA_RESET = (1 << 7), /* use COMRESET */
+ ATA_FLAG_PIO_DMA = (1 << 8), /* PIO cmds via DMA */
ATA_QCFLAG_ACTIVE = (1 << 1), /* cmd not yet ack'd to scsi lyer */
ATA_QCFLAG_SG = (1 << 3), /* have s/g table? */
diff --git a/include/linux/netfilter_ipv4/ip_conntrack_tcp.h b/include/linux/netfilter_ipv4/ip_conntrack_tcp.h
index 0ab4590a0b16..61dad5790198 100644
--- a/include/linux/netfilter_ipv4/ip_conntrack_tcp.h
+++ b/include/linux/netfilter_ipv4/ip_conntrack_tcp.h
@@ -18,7 +18,7 @@ enum tcp_conntrack {
};
/* Window scaling is advertised by the sender */
-#define IP_CT_TCP_STATE_FLAG_WINDOW_SCALE 0x01
+#define IP_CT_TCP_FLAG_WINDOW_SCALE 0x01
/* SACK is permitted by the sender */
#define IP_CT_TCP_FLAG_SACK_PERM 0x02
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index f1946ad646e4..affb193a43e6 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -344,6 +344,7 @@
#define PCI_DEVICE_ID_ATI_RS300_200 0x5833
/* ATI IXP Chipset */
#define PCI_DEVICE_ID_ATI_IXP_IDE 0x4349
+#define PCI_DEVICE_ID_ATI_IXP2_IDE 0x4369 /* True name not yet sure */
#define PCI_VENDOR_ID_VLSI 0x1004
#define PCI_DEVICE_ID_VLSI_82C592 0x0005
@@ -1029,6 +1030,7 @@
#define PCI_DEVICE_ID_AL_M3307 0x3307
#define PCI_DEVICE_ID_AL_M4803 0x5215
#define PCI_DEVICE_ID_AL_M5219 0x5219
+#define PCI_DEVICE_ID_AL_M5228 0x5228
#define PCI_DEVICE_ID_AL_M5229 0x5229
#define PCI_DEVICE_ID_AL_M5237 0x5237
#define PCI_DEVICE_ID_AL_M5243 0x5243
diff --git a/include/linux/socket.h b/include/linux/socket.h
index b3aef7bf1380..4c7d11301abf 100644
--- a/include/linux/socket.h
+++ b/include/linux/socket.h
@@ -90,6 +90,10 @@ struct cmsghdr {
(struct cmsghdr *)(ctl) : \
(struct cmsghdr *)NULL)
#define CMSG_FIRSTHDR(msg) __CMSG_FIRSTHDR((msg)->msg_control, (msg)->msg_controllen)
+#define CMSG_OK(mhdr, cmsg) ((cmsg)->cmsg_len >= sizeof(struct cmsghdr) && \
+ (cmsg)->cmsg_len <= (unsigned long) \
+ ((mhdr)->msg_controllen - \
+ ((char *)(cmsg) - (char *)(mhdr)->msg_control)))
/*
* This mess will go away with glibc
diff --git a/include/linux/types.h b/include/linux/types.h
index 893c4b367bae..dcb13f865df9 100644
--- a/include/linux/types.h
+++ b/include/linux/types.h
@@ -157,8 +157,10 @@ typedef __u16 __bitwise __le16;
typedef __u16 __bitwise __be16;
typedef __u32 __bitwise __le32;
typedef __u32 __bitwise __be32;
+#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
typedef __u64 __bitwise __le64;
typedef __u64 __bitwise __be64;
+#endif
struct ustat {
__kernel_daddr_t f_tfree;
diff --git a/include/linux/usb_sl811.h b/include/linux/usb_sl811.h
new file mode 100644
index 000000000000..4f2d012d7309
--- /dev/null
+++ b/include/linux/usb_sl811.h
@@ -0,0 +1,26 @@
+
+/*
+ * board initialization should put one of these into dev->platform_data
+ * and place the sl811hs onto platform_bus named "sl811-hcd".
+ */
+
+struct sl811_platform_data {
+ unsigned can_wakeup:1;
+
+ /* given port_power, msec/2 after power on till power good */
+ u8 potpg;
+
+ /* mA/2 power supplied on this port (max = default = 250) */
+ u8 power;
+
+ /* sl811 relies on an external source of VBUS current */
+ void (*port_power)(struct device *dev, int is_on);
+
+ /* pulse sl811 nRST (probably with a GPIO) */
+ void (*reset)(struct device *dev);
+
+ // some boards need something like these:
+ // int (*check_overcurrent)(struct device *dev);
+ // void (*clock_enable)(struct device *dev, int is_on);
+};
+
diff --git a/include/linux/wait.h b/include/linux/wait.h
index 8b3a2b86d92a..ddb0a16f31c9 100644
--- a/include/linux/wait.h
+++ b/include/linux/wait.h
@@ -326,8 +326,8 @@ int wake_bit_function(wait_queue_t *wait, unsigned mode, int sync, void *key);
wait_queue_t name = { \
.task = current, \
.func = autoremove_wake_function, \
- .task_list = { .next = &name.task_list, \
- .prev = &name.task_list, \
+ .task_list = { .next = &(name).task_list, \
+ .prev = &(name).task_list, \
}, \
}
@@ -338,15 +338,15 @@ int wake_bit_function(wait_queue_t *wait, unsigned mode, int sync, void *key);
.task = current, \
.func = wake_bit_function, \
.task_list = \
- LIST_HEAD_INIT(name.wait.task_list), \
+ LIST_HEAD_INIT((name).wait.task_list), \
}, \
}
#define init_wait(wait) \
do { \
- wait->task = current; \
- wait->func = autoremove_wake_function; \
- INIT_LIST_HEAD(&wait->task_list); \
+ (wait)->task = current; \
+ (wait)->func = autoremove_wake_function; \
+ INIT_LIST_HEAD(&(wait)->task_list); \
} while (0)
/**
generated by cgit v1.2.3 (git 2.46.0) at 2026-01-27 15:04:19 +0000