---

yaml --- r: 149369 b: refs/heads/master c: 78731d3 h: refs/heads/master i: 149367: aec72b9 v: v3
git-mirror · Jun 11, 2009 · 4b3786c · 4b3786c
1 parent 87e1eda
commit 4b3786c
Show file tree

Hide file tree

Showing 8 changed files with 839 additions and 867 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 391c5111c9ce346edc3c3d8f907eb178a6decd16
+refs/heads/master: 78731d33c1868f4ba43bafcca8dcaf938872c1f2
diff --git a/trunk/arch/arm/common/Kconfig b/trunk/arch/arm/common/Kconfig
@@ -27,10 +27,6 @@ config SHARP_LOCOMO
 config SHARP_PARAM
 	bool
 
-config SHARPSL_PM
-	bool
-	select APM_EMULATION
-
 config SHARP_SCOOP
 	bool
 

diff --git a/trunk/arch/arm/common/Makefile b/trunk/arch/arm/common/Makefile
@@ -12,7 +12,6 @@ obj-$(CONFIG_DMABOUNCE)		+= dmabounce.o
 obj-$(CONFIG_TIMER_ACORN)	+= time-acorn.o
 obj-$(CONFIG_SHARP_LOCOMO)	+= locomo.o
 obj-$(CONFIG_SHARP_PARAM)	+= sharpsl_param.o
-obj-$(CONFIG_SHARPSL_PM)	+= sharpsl_pm.o
 obj-$(CONFIG_SHARP_SCOOP)	+= scoop.o
 obj-$(CONFIG_ARCH_IXP2000)	+= uengine.o
 obj-$(CONFIG_ARCH_IXP23XX)	+= uengine.o