mx53: Enable building without PM_CONFIG, CONFIG_NO_HZ, CONFIG_PREEMPT etc.

diff --git a/_build/.config b/_build/.config
index 8e6422da9d91724be28df1e6e418fba0e04e4552..093e008c3c8d329c73453df7308d461c2092bda8 100644 (file)
--- a/_build/.config
+++ b/_build/.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.35.3
-# Tue Jan 29 11:35:56 2013
+# Tue Feb  5 15:02:13 2013
 #
 CONFIG_ARM=y
 CONFIG_HAVE_PWM=y
@@ -34,7 +34,6 @@ CONFIG_CONSTRUCTORS=y
 #
 CONFIG_EXPERIMENTAL=y
 CONFIG_BROKEN_ON_SMP=y
-CONFIG_LOCK_KERNEL=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
 CONFIG_LOCALVERSION="-vmx53-vpac1"
@@ -172,27 +171,27 @@ CONFIG_DEFAULT_IOSCHED="cfq"
 # CONFIG_INLINE_SPIN_LOCK_BH is not set
 # CONFIG_INLINE_SPIN_LOCK_IRQ is not set
 # CONFIG_INLINE_SPIN_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_SPIN_UNLOCK is not set
+CONFIG_INLINE_SPIN_UNLOCK=y
 # CONFIG_INLINE_SPIN_UNLOCK_BH is not set
-# CONFIG_INLINE_SPIN_UNLOCK_IRQ is not set
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
 # CONFIG_INLINE_SPIN_UNLOCK_IRQRESTORE is not set
 # CONFIG_INLINE_READ_TRYLOCK is not set
 # CONFIG_INLINE_READ_LOCK is not set
 # CONFIG_INLINE_READ_LOCK_BH is not set
 # CONFIG_INLINE_READ_LOCK_IRQ is not set
 # CONFIG_INLINE_READ_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_READ_UNLOCK is not set
+CONFIG_INLINE_READ_UNLOCK=y
 # CONFIG_INLINE_READ_UNLOCK_BH is not set
-# CONFIG_INLINE_READ_UNLOCK_IRQ is not set
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
 # CONFIG_INLINE_READ_UNLOCK_IRQRESTORE is not set
 # CONFIG_INLINE_WRITE_TRYLOCK is not set
 # CONFIG_INLINE_WRITE_LOCK is not set
 # CONFIG_INLINE_WRITE_LOCK_BH is not set
 # CONFIG_INLINE_WRITE_LOCK_IRQ is not set
 # CONFIG_INLINE_WRITE_LOCK_IRQSAVE is not set
-# CONFIG_INLINE_WRITE_UNLOCK is not set
+CONFIG_INLINE_WRITE_UNLOCK=y
 # CONFIG_INLINE_WRITE_UNLOCK_BH is not set
-# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
 # CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
 # CONFIG_MUTEX_SPIN_ON_OWNER is not set
 CONFIG_FREEZER=y
@@ -342,7 +341,7 @@ CONFIG_COMMON_CLKDEV=y
 # Kernel Features
 #
 CONFIG_TICK_ONESHOT=y
-CONFIG_NO_HZ=y
+# CONFIG_NO_HZ is not set
 CONFIG_HIGH_RES_TIMERS=y
 CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 # CONFIG_VMSPLIT_3G is not set
@@ -350,8 +349,8 @@ CONFIG_VMSPLIT_2G=y
 # CONFIG_VMSPLIT_1G is not set
 CONFIG_PAGE_OFFSET=0x80000000
 # CONFIG_PREEMPT_NONE is not set
-# CONFIG_PREEMPT_VOLUNTARY is not set
-CONFIG_PREEMPT=y
+CONFIG_PREEMPT_VOLUNTARY=y
+# CONFIG_PREEMPT is not set
 CONFIG_HZ=100
 # CONFIG_THUMB2_KERNEL is not set
 CONFIG_AEABI=y
@@ -432,24 +431,7 @@ CONFIG_HAVE_AOUT=y
 #
 # Power management options
 #
-CONFIG_PM=y
-# CONFIG_PM_DEBUG is not set
-CONFIG_PM_SLEEP=y
-CONFIG_SUSPEND_NVS=y
-CONFIG_SUSPEND=y
-CONFIG_SUSPEND_FREEZER=y
-CONFIG_HAS_WAKELOCK=y
-CONFIG_HAS_EARLYSUSPEND=y
-CONFIG_WAKELOCK=y
-CONFIG_WAKELOCK_STAT=y
-CONFIG_USER_WAKELOCK=y
-CONFIG_EARLYSUSPEND=y
-# CONFIG_NO_USER_SPACE_SCREEN_ACCESS_CONTROL is not set
-# CONFIG_CONSOLE_EARLYSUSPEND is not set
-CONFIG_FB_EARLYSUSPEND=y
-CONFIG_APM_EMULATION=y
-CONFIG_PM_RUNTIME=y
-CONFIG_PM_OPS=y
+# CONFIG_PM is not set
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_NET=y
 
@@ -1083,7 +1065,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 # CONFIG_INPUT_JOYDEV is not set
 CONFIG_INPUT_EVDEV=y
 # CONFIG_INPUT_EVBUG is not set
-# CONFIG_INPUT_APMPOWER is not set
 
 #
 # Input Device Drivers
@@ -1331,7 +1312,6 @@ CONFIG_W1_SLAVE_DS2438=m
 CONFIG_POWER_SUPPLY=y
 # CONFIG_POWER_SUPPLY_DEBUG is not set
 # CONFIG_PDA_POWER is not set
-CONFIG_APM_POWER=y
 # CONFIG_TEST_POWER is not set
 # CONFIG_BATTERY_DS2760 is not set
 # CONFIG_BATTERY_DS2782 is not set
@@ -1925,8 +1905,6 @@ CONFIG_USB=y
 # CONFIG_USB_DEVICEFS is not set
 CONFIG_USB_DEVICE_CLASS=y
 # CONFIG_USB_DYNAMIC_MINORS is not set
-CONFIG_USB_SUSPEND=y
-# CONFIG_USB_OTG is not set
 # CONFIG_USB_OTG_WHITELIST is not set
 # CONFIG_USB_OTG_BLACKLIST_HUB is not set
 # CONFIG_USB_MON is not set
@@ -2626,7 +2604,6 @@ CONFIG_SCHED_DEBUG=y
 # CONFIG_SLUB_DEBUG_ON is not set
 # CONFIG_SLUB_STATS is not set
 # CONFIG_DEBUG_KMEMLEAK is not set
-CONFIG_DEBUG_PREEMPT=y
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set

diff --git a/arch/arm/plat-mxc/sdma/sdma.c b/arch/arm/plat-mxc/sdma/sdma.c
index ef455b166f2bdc818cfdfddc4b56a3b58b5da80a..f3bad0c63c735c6ebc5afdeaa5bd385db1bb899f 100644 (file)
--- a/arch/arm/plat-mxc/sdma/sdma.c
+++ b/arch/arm/plat-mxc/sdma/sdma.c
@@ -38,6 +38,8 @@
 #include <mach/dma.h>
 #include <mach/hardware.h>
 
+#include <linux/sched.h>
+
 #include "iapi.h"
 
 #define M3_BASE_ADDRESS CSD0_BASE_ADDR

diff --git a/drivers/dma/pxp/pxp_device.c b/drivers/dma/pxp/pxp_device.c
index 70b751141f1c4c71a675002b023cb274a7797c54..2050f93ca1cb39f52ab44d540f0e008829c8dff7 100644 (file)
--- a/drivers/dma/pxp/pxp_device.c
+++ b/drivers/dma/pxp/pxp_device.c
@@ -25,6 +25,7 @@
 #include <linux/delay.h>
 #include <linux/dmaengine.h>
 #include <linux/pxp_dma.h>
+#include <linux/sched.h>
 
 #include <asm/atomic.h>
 

diff --git a/drivers/dma/pxp/pxp_dma.c b/drivers/dma/pxp/pxp_dma.c
index fb962f611946191b246e135acf7e2d099a04b55b..4384e911676e5ba7df1746f602f78a185b573887 100644 (file)
--- a/drivers/dma/pxp/pxp_dma.c
+++ b/drivers/dma/pxp/pxp_dma.c
@@ -36,6 +36,7 @@
 #include <linux/timer.h>
 #include <linux/clk.h>
 #include <linux/workqueue.h>
+#include <linux/sched.h>
 
 #include "regs-pxp.h"
 

diff --git a/drivers/media/video/mxc/capture/ipu_still.c b/drivers/media/video/mxc/capture/ipu_still.c
index 355149f452a63a3be629c62475872257ea694d6a..892148faf7bab5c7390e7fbdff272f7218be6cf1 100644 (file)
--- a/drivers/media/video/mxc/capture/ipu_still.c
+++ b/drivers/media/video/mxc/capture/ipu_still.c
@@ -22,6 +22,8 @@
 #include <linux/ipu.h>
 #include <linux/semaphore.h>
 #include <linux/ipu.h>
+#include <linux/sched.h>
+
 #include "mxc_v4l2_capture.h"
 #include "ipu_prp_sw.h"
 

diff --git a/drivers/mxc/asrc/mxc_asrc.c b/drivers/mxc/asrc/mxc_asrc.c
index 3b870e5d16f1765fcde334c2a60e53953317507d..3389d63056b2eaaaef8f85852b772e1e2168b1f8 100644 (file)
--- a/drivers/mxc/asrc/mxc_asrc.c
+++ b/drivers/mxc/asrc/mxc_asrc.c
@@ -39,6 +39,7 @@
 #include <asm/irq.h>
 #include <asm/memory.h>
 #include <mach/dma.h>
+#include <linux/sched.h>
 
 static int asrc_major;
 static struct class *asrc_class;

diff --git a/drivers/mxc/vpu/mxc_vpu.c b/drivers/mxc/vpu/mxc_vpu.c
index 7df033b2c1493cee02e3678034dce45e3a431f81..a34b4b6ea0dbe54ca20a6d2d46ceaba6e729aef2 100644 (file)
--- a/drivers/mxc/vpu/mxc_vpu.c
+++ b/drivers/mxc/vpu/mxc_vpu.c
@@ -37,6 +37,7 @@
 #include <linux/io.h>
 #include <linux/slab.h>
 #include <linux/workqueue.h>
+#include <linux/sched.h>
 
 #include <asm/sizes.h>
 #include <mach/clock.h>

diff --git a/drivers/rtc/rtc-mxc_v2.c b/drivers/rtc/rtc-mxc_v2.c
index 13d6144a790cbdeaf4781b54c2e588ce99cfe5e6..1cf3f7accc8e29ec93a2b7a6d54e966859b936e2 100644 (file)
--- a/drivers/rtc/rtc-mxc_v2.c
+++ b/drivers/rtc/rtc-mxc_v2.c
@@ -38,6 +38,7 @@
 #include <linux/uaccess.h>
 #include <linux/io.h>
 #include <linux/mxc_srtc.h>
+#include <linux/sched.h>
 
 #define SRTC_LPSCLR_LLPSC_LSH  17       /* start bit for LSB time value */
 

diff --git a/drivers/usb/gadget/f_adb.c b/drivers/usb/gadget/f_adb.c
index e89186e9412798546372b625fc5817a5da213d0f..12e425a0912b5ff104183a10d7966280d229d3fa 100644 (file)
--- a/drivers/usb/gadget/f_adb.c
+++ b/drivers/usb/gadget/f_adb.c
@@ -25,6 +25,7 @@
 #include <linux/wait.h>
 #include <linux/err.h>
 #include <linux/interrupt.h>
+#include <linux/sched.h>
 
 #include <linux/types.h>
 #include <linux/device.h>

diff --git a/drivers/usb/host/ehci-arc.c b/drivers/usb/host/ehci-arc.c
index ed686e8aac28d67e574f8788a0b9c570e1c38282..a0d8c705855f89a84d7fe34b293013cab78d4ca8 100644 (file)
--- a/drivers/usb/host/ehci-arc.c
+++ b/drivers/usb/host/ehci-arc.c
@@ -416,9 +416,11 @@ static int ehci_fsl_bus_suspend(struct usb_hcd *hcd)
        }
 
        portsc = ehci_readl(ehci, &ehci->regs->port_status[0]);
+#ifdef PM_CONFIG
        ret = ehci_bus_suspend(hcd);
        if (ret != 0)
                return ret;
+#endif
 
        if (portsc & PORT_CCS) {
                printk(KERN_DEBUG "there is a device on the port\n");
@@ -464,9 +466,11 @@ static int ehci_fsl_bus_resume(struct usb_hcd *hcd)
        if (pdata->platform_resume)
                pdata->platform_resume(pdata);
 
+#ifdef PM_CONFIG
        ret = ehci_bus_resume(hcd);
        if (ret)
                return ret;
+#endif
 
        return ret;
 }