summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@evo.osdl.org>2005-09-06 00:45:34 -0700
committerLinus Torvalds <torvalds@evo.osdl.org>2005-09-06 00:45:34 -0700
commit1e231efe50ffe4d291be24d2fe393188de9c4b08 (patch)
tree5a7b92970eedd27c74bdf29c2cbe23e9b6a6a849 /include
parentef88b7dba2b47c70037a34a599d383462bb74bd3 (diff)
parent0ce7625f3c1e3f921f6b83f7e944e00031a39dfa (diff)
downloadop-kernel-dev-1e231efe50ffe4d291be24d2fe393188de9c4b08.zip
op-kernel-dev-1e231efe50ffe4d291be24d2fe393188de9c4b08.tar.gz
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'include')
-rw-r--r--include/asm-arm/hardware/scoop.h13
-rw-r--r--include/asm-arm/mach/time.h2
2 files changed, 13 insertions, 2 deletions
diff --git a/include/asm-arm/hardware/scoop.h b/include/asm-arm/hardware/scoop.h
index 7ea771f..527404b 100644
--- a/include/asm-arm/hardware/scoop.h
+++ b/include/asm-arm/hardware/scoop.h
@@ -40,6 +40,19 @@ struct scoop_config {
unsigned short io_dir;
};
+/* Structure for linking scoop devices to PCMCIA sockets */
+struct scoop_pcmcia_dev {
+ struct device *dev; /* Pointer to this socket's scoop device */
+ int irq; /* irq for socket */
+ int cd_irq;
+ const char *cd_irq_str;
+ unsigned char keep_vs;
+ unsigned char keep_rd;
+};
+
+extern int scoop_num;
+extern struct scoop_pcmcia_dev *scoop_devs;
+
void reset_scoop(struct device *dev);
unsigned short set_scoop_gpio(struct device *dev, unsigned short bit);
unsigned short reset_scoop_gpio(struct device *dev, unsigned short bit);
diff --git a/include/asm-arm/mach/time.h b/include/asm-arm/mach/time.h
index 2cf279a..96c6db7 100644
--- a/include/asm-arm/mach/time.h
+++ b/include/asm-arm/mach/time.h
@@ -47,9 +47,7 @@ struct sys_timer {
#ifdef CONFIG_NO_IDLE_HZ
-#define DYN_TICK_SKIPPING (1 << 2)
#define DYN_TICK_ENABLED (1 << 1)
-#define DYN_TICK_SUITABLE (1 << 0)
struct dyn_tick_timer {
unsigned int state; /* Current state */
OpenPOWER on IntegriCloud